Skip to content

janitor stuff #1384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cornercube wants to merge 5 commits into
base: master
Choose a base branch
from
Open

janitor stuff #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f55e03
janitorservice
cornercube Aug 11, 2026
342705e
Merge branch 'master' into janistuff
cornercube Aug 11, 2026
6e339b4
Update pimpin_ride.dm
cornercube Aug 12, 2026
c973d3c
Merge branch 'janistuff' of https://github.com/cornercube/SecondCity …
cornercube Aug 12, 2026
f6f459f
Merge branch 'master' into janistuff
cornercube Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions code/modules/vehicles/pimpin_ride.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
* # Janicart
*/
/obj/vehicle/ridden/janicart
name = "janicart (pimpin' ride)"
desc = "A brave janitor cyborg gave its life to produce such an amazing combination of speed and utility."
icon_state = "pussywagon"
name = "street sweeper" //dark pack edit
desc = "A man-portable cleaning device used to keep the streets clean, nicknamed the 'Pussy Wagon'. Needs a key to be used."
icon = 'modular_darkpack/master_files/icons/mob/rideables/vehicles.dmi'//dark pack master folder
icon_state = "pussywagon" //darkpack edit
Comment on lines 4 to +8

@chazzyjazzy chazzyjazzy Aug 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can u read the modularization guide for proper formatting on these comments?

key_type = /obj/item/key/janitor
movedelay = 1
/// The attached garbage bag, if present
Expand Down
2 changes: 1 addition & 1 deletion modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
r_pocket = /obj/item/vamp/keys/cleaning
shoes = /obj/item/clothing/shoes/vampire/jackboots/work
gloves = /obj/item/clothing/gloves/vampire/cleaning
backpack_contents = list(/obj/item/vamp/keys/hack=1, /obj/item/card/credit=1)
backpack_contents = list(/obj/item/vamp/keys/hack=1, /obj/item/card/credit=1,/obj/item/gun/ballistic/automatic/darkpack/mac10/super=1,/obj/item/ammo_box/magazine/darkpack45custom=1)
2 changes: 1 addition & 1 deletion modular_darkpack/modules/weapons/code/guns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@

/obj/item/gun/ballistic/automatic/darkpack/mac10/super
name = "\improper Cleaner Custom"
desc = "A .45 submachine gun with a suppressor installed on the tip, which helps balance it out when firing. Dark Blood magic has enabled the wire stock to be used"
desc = "A .45 submachine gun with a suppressor installed on the tip, which helps balance it out when firing. Dark Blood magic has enabled the wire stock to be extended, further increasing accuracy."
icon = 'modular_darkpack/modules/deprecated/icons/64x32.dmi'
ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi')
icon_state = "mac10_super"
Expand Down
Loading