cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
ba0f6abb02e5e9692282a38e83f262273a4319cd
Paradise/code/game/objects/structures
History
Mark van Alphen ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
2019-04-30 19:26:17 +02:00
..
crates_lockers
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-04-26 23:07:57 +02:00
decor
…
stool_bed_chair_nest
Fixes runtime when double-clicking a stool item in hand
2019-01-26 16:30:27 -08:00
transit_tubes
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
aliens.dm
Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature
2019-03-24 17:50:07 +08:00
barsign.dm
…
bedsheet_bin.dm
Add seed vault and animal hospital
2019-03-31 23:49:18 +02:00
coathanger.dm
…
curtains.dm
…
depot.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
displaycase.dm
MERGE SHIT REEEEE IMMAH PUNCH A WALL
2018-12-18 11:47:29 +00:00
door_assembly_types.dm
…
door_assembly.dm
…
dresser.dm
…
electricchair.dm
…
engicart.dm
…
extinguisher.dm
Code review fixes
2019-04-28 20:27:45 +02:00
false_walls.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
flora.dm
…
fluff.dm
Add seed vault and animal hospital
2019-03-31 23:49:18 +02:00
foodcart.dm
…
girders.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
grille.dm
fixups
2019-04-29 04:41:31 -04:00
guillotine.dm
Casing correction 1
2018-12-17 00:07:37 -05:00
holosign.dm
shocking animals
2019-04-12 16:03:18 -04:00
inflatable.dm
better way
2019-03-24 07:59:39 +01:00
janicart.dm
…
kitchen_spike.dm
…
ladders.dm
…
lamarr_cage.dm
…
lattice.dm
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
mineral_doors.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
2019-03-30 22:55:09 +01:00
mirror.dm
add "voice" option to magic mirror
2019-02-22 02:05:34 +00:00
misc.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
mop_bucket.dm
…
morgue.dm
Casing correction 1
2018-12-17 00:07:37 -05:00
musician.dm
…
noticeboard.dm
…
plasticflaps.dm
better way
2019-03-24 07:59:39 +01:00
reflector.dm
biggest change ever
2018-12-29 10:55:59 +00:00
safe.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
signs.dm
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
spirit_board.dm
…
statues.dm
Change it
2019-03-26 18:59:53 +02:00
table_frames.dm
…
tables_racks.dm
…
tank_dispenser.dm
…
target_stake.dm
…
watercloset.dm
…
windoor_assembly.dm
Fixes windoors not spawning electronics once deconstructed
2019-04-17 12:09:20 +02:00
window.dm
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00