cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d100c30821929fe40b4989a60848255b95b3a8ee
VOREStation/code/game/objects/structures
History
Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
..
crates_lockers
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
stool_bed_chair_nest
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
barsign.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
bedsheet_bin.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
coathanger.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
curtains.dm
Merge pull request #1239 from Mark9013100/3/23/2016layering
2016-03-26 17:06:54 -04:00
displaycase.dm
Adds click cooldown to display case
2016-05-13 01:34:19 +01:00
door_assembly.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
electricchair.dm
…
extinguisher.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
flora.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
girders.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
grille.dm
Updates blob
2015-10-05 18:10:16 +03:00
inflatable.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
janicart.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
kitchen_spike.dm
Fixes #2012
2016-08-15 10:46:26 -04:00
lattice.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
map_blocker_vr.dm
Beach.dmm fixes
2016-05-21 16:32:37 -04:00
mirror.dm
Construction Update
2016-03-25 16:02:36 -04:00
mop_bucket.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
morgue.dm
Morgue Trays interface with occupant minds
2016-04-25 20:10:43 +02:00
musician.dm
Ports Byond 510 preperations from Bay
2016-03-14 18:21:44 +00:00
noticeboard.dm
Reverts the second mob clean up because of incomplete implementation.
2016-05-04 00:24:55 -04:00
safe.dm
Construction Update
2016-03-25 16:02:36 -04:00
signs.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
simple_doors.dm
…
tank_dispenser.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
target_stake.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
transit_tubes.dm
Ports Byond 510 preperations from Bay
2016-03-14 18:21:44 +00:00
under_wardrobe.dm
Adds a verb for toggling specific pieces of underwear
2016-08-12 20:58:40 +02:00
watercloset.dm
item_state cleanup
2016-07-11 22:31:32 -04:00
windoor_assembly.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
window_spawner.dm
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
window.dm
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00