cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 22:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
56f5cb9e4ebbc7f52e5aea2a9d7a61e6fdc1b2f5
Aurora.3/code/game/objects/structures
History
Cael_Aislinn 56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport 
Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-06 13:13:57 +10:00
..
crates_lockers
Merge tgstation r4633 into bs12_with_tgport
2012-09-06 13:13:57 +10:00
stool_bed_chair_nest
File restructuring!
2012-08-29 18:00:30 +00:00
bedsheet_bin.dm
File restructuring!
2012-08-29 18:00:30 +00:00
displaycase.dm
File restructuring!
2012-08-29 18:00:30 +00:00
door_assembly.dm
Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport
2012-08-24 21:55:58 +10:00
electricchair.dm
Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport
2012-08-24 21:55:58 +10:00
extinguisher.dm
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
2012-09-04 22:19:03 +10:00
false_walls.dm
Fixes issue 879
2012-09-05 23:28:14 +00:00
girders.dm
More file structure stuff.
2012-08-26 01:20:02 +00:00
grille.dm
- Committing the updated recursive explosion code. It now takes into account objects too.
2012-08-30 05:38:10 +00:00
kitchen_spike.dm
File restructuring!
2012-08-29 18:00:30 +00:00
ladders.dm
…
lamarr_cage.dm
…
lattice.dm
File restructuring!
2012-08-29 18:00:30 +00:00
mineral_doors.dm
Merge tgstation13 r4570 into bs12_with_tgport
2012-08-28 19:57:11 +10:00
mirror.dm
…
mop_bucket.dm
File restructuring!
2012-08-29 18:00:30 +00:00
morgue.dm
File restructuring!
2012-08-29 18:00:30 +00:00
musician.dm
Runtime fixes for:
2012-09-02 22:32:24 +00:00
noticeboard.dm
File restructuring!
2012-08-29 18:00:30 +00:00
tables_racks.dm
File restructuring!
2012-08-29 18:00:30 +00:00
target_stake.dm
…
watercloset.dm
Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport
2012-08-24 21:55:58 +10:00
windoor_assembly.dm
Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport
2012-08-24 21:55:58 +10:00
window.dm
Merge tgstation r4633 into bs12_with_tgport
2012-09-06 13:13:57 +10:00