cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
01f2c85347748bd833484d08df88a32136fe1dd7
Paradise/code/game/objects/structures
History
Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
..
crates_lockers
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
2016-12-23 19:32:19 +01:00
stool_bed_chair_nest
Merge conflicts begone
2016-08-01 18:28:47 -07:00
transit_tubes
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
artstuff.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
barsign.dm
Mass replace
2016-07-07 19:34:02 -07:00
bedsheet_bin.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
coathanger.dm
Mass replace
2016-07-07 19:34:02 -07:00
curtains.dm
…
displaycase.dm
Mass replace
2016-07-07 19:34:02 -07:00
door_assembly.dm
Mass replace
2016-07-07 19:34:02 -07:00
dresser.dm
Sorts out some runtimes, adds randomization for a bunch more stuff in character preferences, adds species validation to undergarments, adds absolute pathing to sprite_accessories and repaths alot of stuff.
2016-08-27 09:22:01 -04:00
electricchair.dm
Field Generator Cleanup, Singularity Fixes,
2016-08-03 17:17:04 -04:00
engicart.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
extinguisher.dm
Mass replace
2016-07-07 19:34:02 -07:00
false_walls.dm
Redo of clown/mime door fix.
2016-09-12 20:11:54 +10:00
flora.dm
Add Colossus, add outdoors variable to areas and update fireball targeting
2016-10-25 04:10:52 +02:00
foodcart.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
fullwindow.dm
…
girders.dm
Fix cult girder layer
2016-10-21 18:04:00 +02:00
grille.dm
Grille Inconsistency Fix
2016-07-08 03:29:16 -05:00
inflatable.dm
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
janicart.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
kitchen_spike.dm
…
ladders.dm
…
lamarr_cage.dm
Mass replace
2016-07-07 19:34:02 -07:00
lattice.dm
Mass replace
2016-07-07 19:34:02 -07:00
mineral_doors.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
mirror.dm
Mass replace
2016-07-07 19:34:02 -07:00
misc.dm
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
mop_bucket.dm
create reagents proc
2016-11-06 14:37:47 -05:00
morgue.dm
Polishes up the reset_view proc, which is basically
2016-12-21 17:56:57 -08:00
musician.dm
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-14 13:37:34 -08:00
noticeboard.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
safe.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
signs.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00
spirit_board.dm
…
statue.dm
…
tables_racks.dm
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
tank_dispenser.dm
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
target_stake.dm
…
watercloset.dm
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
windoor_assembly.dm
tweak
2016-07-26 14:02:07 -04:00
window.dm
Merge conflicts begone
2016-08-01 18:28:47 -07:00