cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 13:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
cb2354876862379b16c6264bc4e5ee41a170c1b8
Bubberstation/code/game/objects/structures
History
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
..
crates_lockers
Merge pull request #8455 from Incoming5643/how_bout_I_get_you_some_stones
2015-03-23 16:31:53 -07:00
stool_bed_chair_nest
Fixes a runtime with buckling screen alert
2015-03-09 19:09:52 +01:00
transit_tubes
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
barsigns.dm
adds more barsigns
2015-03-05 14:06:44 -05:00
bedsheet_bin.dm
ASS BLAST USA USA USA USA
2015-03-09 17:50:37 -04:00
displaycase.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
door_assembly.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
dresser.dm
Fixes some grammar for the dresser.
2014-12-22 20:00:31 -06:00
electricchair.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
extinguisher.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
false_walls.dm
Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.
2015-03-09 21:48:45 +00:00
flora.dm
Procedural Map Generator System
2015-02-15 12:08:02 +00:00
girders.dm
Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
2015-03-08 23:41:50 -05:00
grille.dm
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
janicart.dm
slight fix
2015-03-09 19:19:17 +01:00
kitchen_spike.dm
bop
2015-03-12 20:00:10 -04:00
ladders.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
lamarr_cage.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
lattice.dm
Merge remote-tracking branch 'upstream/master' into catwalkmachines
2015-03-20 17:02:00 +00:00
mineral_doors.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
mirror.dm
Adds a cheap looking pulse animation for magic mirrors so wizards notice they are actually more than normal mirrors
2015-03-09 12:42:41 -04:00
mop_bucket.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
morgue.dm
Fixes no blood dna on Mulebot and its blood tracks.
2015-02-26 19:31:55 +01:00
musician.dm
Added a preference toggle for hearing musical instruments
2015-03-22 01:54:30 -07:00
noticeboard.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
OpTable.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
safe.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
signs.dm
adds directional signs from bay
2015-02-01 06:13:21 -08:00
spirit_board.dm
…
statues.dm
Improves drill's handling of power
2015-03-05 17:12:12 +11:00
table_frames.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
tables_racks.dm
Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.
2015-03-09 21:48:45 +00:00
tank_dispenser.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
target_stake.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
watercloset.dm
Fixes trash disappearing when washed in a sink.
2015-03-03 00:07:08 +01:00
windoor_assembly.dm
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
window.dm
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00