cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-30 19:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
179b0b532dad7e51135c8c4baaa9470b4e70e707
Bubberstation/code/modules
History
Joan Lung 179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur 
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
2016-09-12 17:14:39 -04:00
..
admin
Fixes byond triggering 511 client required needlessly (#20478)
2016-09-12 19:24:27 +01:00
assembly
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
atmospherics
Fix scrubbing freon\water vapor + fix labelling canisters with freon\water vapor (#20301)
2016-09-04 22:24:29 +02:00
awaymissions
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
cargo
changes to instead use the argument in get_uplink_items
2016-09-07 21:49:54 -07:00
chatter
…
client
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
clothing
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
countdown
Makes cult structures destructible and readds them
2016-09-08 09:54:01 -04:00
crafting
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
detectivework
Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
2016-09-02 18:04:18 +01:00
emoji
…
events
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
flufftext
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
food_and_drinks
Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
2016-09-10 20:28:23 +01:00
games
…
holiday
…
holodeck
…
html_interface
…
hydroponics
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
jobs
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
library
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
lighting
…
mining
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
mob
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
modular_computers
Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
2016-09-10 20:28:23 +01:00
ninja
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
paperwork
Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
2016-09-02 18:04:18 +01:00
power
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
procedural_mapping
…
projectiles
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
reagents
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
recycling
…
research
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
ruins
The Hierophant (#19921)
2016-09-05 10:05:35 +12:00
security_levels
…
shuttle
…
space_transition
…
spells
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
station_goals
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
stock_market
Update stocks.dm
2016-08-25 21:50:04 -07:00
surgery
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
telesci
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
tgui
Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
2016-09-10 20:28:23 +01:00
tooltip
…
uplink
changes to instead use the argument in get_uplink_items
2016-09-07 21:49:54 -07:00
vehicles
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
VR
…
zombie
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00