cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
029bc65b93cbc7bcfe95992b2a914346d9a7c054
Bubberstation/code/modules
History
phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing 
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02:00
..
admin
Plane master handling + new chemical Rotatium (#20707)
2016-10-18 11:41:23 +02:00
assembly
Contents_explosion() tweaks (#20934)
2016-10-16 10:01:37 +13:00
atmospherics
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
awaymissions
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
cargo
Adds a mining gear crate to cargo (#20943)
2016-10-13 12:56:43 +13:00
chatter
…
client
Plane master handling + new chemical Rotatium (#20707)
2016-10-18 11:41:23 +02:00
clothing
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
countdown
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
crafting
Replaces yet more istypes with helpers (#20806)
2016-10-10 17:48:35 +13:00
detectivework
Suicide now uses the pronoun helpers (#20973)
2016-10-18 14:36:38 +13:00
emoji
…
events
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
flufftext
Plane master handling + new chemical Rotatium (#20707)
2016-10-18 11:41:23 +02:00
food_and_drinks
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
games
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
holiday
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
holodeck
Reorganizes the area folder to be more readable (multiple files instead of a big one with a million areas defined, moving areas that were defined outside the folder back into the folder).
2016-10-17 21:19:31 +02:00
html_interface
…
hydroponics
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
jobs
Contents_explosion() tweaks (#20934)
2016-10-16 10:01:37 +13:00
library
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
lighting
Plane master handling + new chemical Rotatium (#20707)
2016-10-18 11:41:23 +02:00
mining
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
mob
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
modular_computers
Merge pull request #20992 from swindly/spelling
2016-10-18 09:15:32 +13:00
ninja
Makes the pronoun helper proc names less horrifyingly long (#20780)
2016-10-10 12:28:25 +13:00
orbit
…
paperwork
Minor devil fixes (#20770)
2016-10-18 08:45:45 +02:00
power
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
procedural_mapping
Adds a few turf istype helpers (#20754)
2016-10-01 19:25:46 +02:00
projectiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
reagents
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
recycling
Revert "Makes drag/drop that dont have any use call click"
2016-10-16 12:41:42 -07:00
research
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
ruins
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
security_levels
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
shuttle
Adding var/list/atom_colours to /atom .
2016-10-19 01:51:30 +02:00
space_transition
…
spells
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
station_goals
Adds a few turf istype helpers (#20754)
2016-10-01 19:25:46 +02:00
stock_market
Properly brackets the conditionals for if
2016-10-05 13:46:14 +03:00
surgery
Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
2016-10-19 01:56:02 +02:00
telesci
…
tgui
More istypes replaced with helpers (#20767)
2016-10-03 13:40:13 +13:00
tooltip
…
uplink
CQC PR AGAIN and does what orangus wanted. (#20932)
2016-10-18 09:11:02 +13:00
vehicles
Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
2016-10-10 11:14:59 +13:00
VR
…
zombie
Suicide now uses the pronoun helpers (#20973)
2016-10-18 14:36:38 +13:00