cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a6cf62a9e05785fefaee43c93afc5d9d636373c8
Bubberstation/code/modules
History
tkdrg a6cf62a9e0 Merge remote-tracking branch 'upstream/master' into attackoftheturfs 
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
2014-10-20 17:27:02 -03:00
..
admin
Merge pull request #5257 from Incoming5643/WhatAJobber
2014-10-20 14:35:18 +01:00
assembly
Merge pull request #5263 from Aranclanos/electropackrevamp
2014-10-16 08:08:57 -05:00
awaymissions
Makes the gateway unacidable.
2014-10-12 20:43:15 +03:00
client
Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2
2014-10-08 09:48:49 -07:00
clothing
Merge pull request #5347 from RemieRichards/LabcoatSwitchFix
2014-10-20 01:04:09 -05:00
crafting
On second thought, leave the result as just a path
2014-10-10 14:30:41 -07:00
detectivework
…
events
Merge pull request #5318 from phil235/MsgFix2
2014-10-19 21:39:06 -05:00
flufftext
Merge pull request #5318 from phil235/MsgFix2
2014-10-19 21:39:06 -05:00
food&drinks
Ian emotes while eating again. Fixed #5147
2014-10-11 14:35:35 +02:00
hydroponics
Merge pull request #5075 from Incoming5643/FuckIKEA
2014-10-16 23:00:07 -05:00
library
bookcases no longer opaque
2014-10-04 18:28:30 -07:00
mining
Merge remote-tracking branch 'upstream/master' into attackoftheturfs
2014-10-20 17:27:02 -03:00
mob
Merge pull request #5200 from PatchouliKnowledge/Phazons
2014-10-20 01:27:50 -05:00
nano
…
paperwork
Merge pull request #5201 from Cheridan/permits
2014-10-17 05:24:37 +01:00
power
Changes many span classes.
2014-10-18 16:00:38 +02:00
projectiles
Makes riot shotgun unique
2014-10-14 15:47:43 +11:00
reagents
[nerfingintesifies]
2014-10-11 08:04:35 -07:00
recycling
Floor refactor, try #1
2014-10-19 16:48:35 -03:00
research
Merge pull request #5200 from PatchouliKnowledge/Phazons
2014-10-20 01:27:50 -05:00
scripting
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
security levels
Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
2014-10-05 13:48:11 +02:00
shuttle
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
surgery
…
telesci
Removes telesci comp's update_icon override
2014-10-07 23:16:52 +11:00