Skip to content
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

Jump to bottom

Big Blanket of Cyrogaia Tweaks #1390

Merged
merged 17 commits into from
Jan 15, 2024
Merged

Big Blanket of Cyrogaia Tweaks #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
05d8d1b
Added first of slum dorms, added first stand above dorms
quackjack Jan 10, 2024
214717b
Update cryogaia-04-maintenance.dmm
quackjack Jan 10, 2024
00c044f
Research maint starboard expanded, added ladder to below maint + beau…
quackjack Jan 12, 2024
806f50c
Update cryogaia-04-maintenance.dmm
quackjack Jan 12, 2024
998f1fc
Prep
quackjack Jan 12, 2024
a046481
Open natural hotspring vein implemented
quackjack Jan 12, 2024
3319559
Slumdorm 1 and 2 finalized
quackjack Jan 13, 2024
dd464ad
Update cryogaia-04-maintenance.dmm
quackjack Jan 14, 2024
ea46935
Update cryogaia-04-maintenance.dmm
quackjack Jan 14, 2024
ff28fff
Update cryogaia-04-maintenance.dmm
quackjack Jan 14, 2024
92990cc
Small adds + legtrap implemenatation
quackjack Jan 14, 2024
466ce4e
Update cryogaia-04-maintenance.dmm
quackjack Jan 14, 2024
c985b5e
Fin
quackjack Jan 15, 2024
6db29cb
Merge branch 'master' into maintflavoring
Repede Jan 15, 2024
7e33bd1
Update code/game/objects/items/weapons/traps.dm
quackjack Jan 15, 2024
49de1bb
Fix commit
quackjack Jan 15, 2024
ab72e74
Merge branch 'master' into maintflavoring
izac112 Jan 15, 2024
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
5 changes: 5 additions & 0 deletions code/game/objects/items/weapons/traps.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,3 +394,8 @@
/obj/item/weapon/material/barbedwire/plastic
name = "snare wire"
default_material = MAT_PLASTIC

// YW ADDITION
/obj/item/weapon/beartrap/armed
quackjack marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "beartrap1"
deployed = 1
12 changes: 12 additions & 0 deletions code/game/objects/random/mapping.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1680,3 +1680,15 @@
prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
)
//VOREStation Add End

/obj/random/multiple/legtrap //YW Addition
name = "random legtraps"
desc = "Random legtraps (beartraps and mousetraps)."
icon = 'icons/misc/random_spawners.dmi'
icon_state = "generic"

/obj/random/multiple/legtrap/item_to_spawn()
return pick(
prob(67);list(/obj/item/device/assembly/mousetrap/armed),
prob(33);list(/obj/item/weapon/beartrap/armed),
)
Binary file modified icons/turf/outdoors_yw.dmi
View file
Open in desktop
Binary file not shown.
Loading