cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,655 Commits 61 Branches 14 Tags
9a8edff52418dfd72722d09f420faffd990f28b0
Commit Graph

4149 Commits

Author SHA1 Message Date
Pete Goodfellow
9a8edff524 Merge fix. Updated to MetaStation.v39B.II.dmm 2014-01-21 21:57:10 +00:00
Pete Goodfellow
d80719c330 Merge branch 'tg-mapchange' of github.com:Mloc/-tg-station into mapsss 
Conflicts:
	_maps/RandomZLevels/fileList.txt
	_maps/map_files/MetaStation.v39A.III.dmm
	maps/MetaStation.v39A.III.dmm
	maps/MetaStation.v39B.II.dmm
	tgstation.dme
 2014-01-21 21:50:32 +00:00
JJRcop
0e45022798 Resolved more conflicts with drying rack before being pulled 
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
 2014-01-21 13:01:53 -05:00
Cheridan
e0680a509e Merge pull request #2449 from Razharas/SlimesAndWindows 
Fixes metr-err- i mean slimes
 2014-01-20 17:25:31 -08:00
Pete Goodfellow
e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
 2014-01-20 19:29:47 +00:00
fleure
ad49512b4e Merge pull request #2440 from Petethegoat/suicideformat 
Updated all suicide_act()s to use a new span class, 'suicide'.
 2014-01-20 11:11:23 -08:00
fleure
d6964e703d Merge pull request #2442 from Alek2ander/master 
Logs, logs everywhere
 2014-01-20 11:08:57 -08:00
fleure
f3ca9c0c2c Merge pull request #2446 from Petethegoat/walkspeed 
Speeds up walking from 7 delay to 4.
 2014-01-20 10:54:36 -08:00
Pete Goodfellow
a462177c8e Adjusts movement_delay() for aliens, to use inheritance! 
Speeds up drones, they are now the same speed as sentinels.
 2014-01-20 18:31:57 +00:00
fleure
c73f6f7eec Merge pull request #2445 from Razharas/AbstractNonsense 
Fixes the admin notice thingie
 2014-01-20 10:27:47 -08:00
Cheridan
9cbb9bb403 Merge pull request #2434 from johnsmith38/master 
Black Baseball Caps [FIXED]
 2014-01-19 20:21:40 -08:00
Cheridan
70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises 
[501] Refactored the code to remove most icon operations for changing an icon's colour.
 2014-01-19 16:06:25 -08:00
Razharas
63e9192fe7 Fixes metr-err- i mean slimes 
Fixes #225
 2014-01-20 02:29:36 +04:00
Pete Goodfellow
fd4df85045 Changed legcuffs to use slowdown instead of forcing the user to walk. 2014-01-19 20:17:23 +00:00
Pete Goodfellow
9df2455cfb Speeds up walking from 7 delay to 4. Removes the hardcoded walk/running delays, and uses the config options instead. 2014-01-19 19:44:11 +00:00
Razharas
2254ad4cb6 Fixes the admin notice thingie 
Fixes #2427
 2014-01-19 22:05:35 +04:00
Alek2ander
9fa38637ad Logs everywhere 
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
 2014-01-19 21:16:30 +04:00
Pete Goodfellow
af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
Pete Goodfellow
5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket. 
Also makes ties show up on the jumpsuit object.
 2014-01-19 14:50:27 +00:00
fleure
05e96e477d Merge pull request #2424 from RobRichards1997/18/01/2014-Cyborg-Debraining 
Fixes not being able to debrain augmented humans
 2014-01-19 03:42:57 -08:00
John Smith
a3e94d74e9 Black Baseball Caps [FIXED] 2014-01-19 00:35:10 -08:00
MrPerson
adbb273221 Merge pull request #2419 from KazeEspada/goodbyespaceworms2014 
removes space worms
 2014-01-18 23:24:22 -08:00
fleure
41af5a264f Merge pull request #2414 from Razharas/BorgsMASTA!!--SPAAAAAAAAAAAAAAAKU!! 
Fixes borgs sparking when hit with 0 damage items
 2014-01-18 17:28:52 -08:00
fleure
65729c6500 Merge pull request #2418 from hornygranny/necrophilia 
Animal necrophilia removed
 2014-01-18 17:23:58 -08:00
Giacom
3a77ff99f7 Merge pull request #2407 from hornygranny/chameleonfix 
Chameleon jumpsuit fix
 2014-01-18 12:29:44 -08:00
Cheridan
b4f1e03341 Merge pull request #2285 from ChuckTheSheep/Botany 
Irrigation Botany Changes
 2014-01-18 12:12:38 -08:00
Robson Richards
0af17afec7 fixes not being able to debrain augmented humans 2014-01-18 12:26:00 +00:00
Cheridan
9468c30e05 Merge pull request #2374 from tgstation/501 
Merging 501 with Master.
 2014-01-17 21:33:46 -08:00
KazeEspada
f693f58e49 removes space worms :(. They are in a better place now. 2014-01-17 19:32:31 -07:00
Hornygranny
401455f1d0 Fixes animal necrophilia 2014-01-17 17:07:52 -08:00
fleure
e7951aa5f1 Merge pull request #2310 from KazeEspada/papercupsshallconsumetheworldwiththeirtrash 
paper cups
 2014-01-17 16:43:15 -08:00
KazeEspada
8f25508df0 Fixes an accidental oversight in replenishing cups. It now turns paper into cups using magic. 2014-01-17 17:37:57 -07:00
Giacomand
d664e5265c Cleaning up and a new discovery, for me, means you don't have to unsanitize the color. 2014-01-18 00:25:33 +00:00
Jittai
5d51eb65e3 FindConnected Fix 
FindConnected was using src in getstep instead of "a" the processing atom.
 2014-01-17 19:06:11 -05:00
Jittai
70729846ab Fixes Icon Update Issues Found 2014-01-17 18:56:28 -05:00
Razharas
44a48654c3 Fixes borgs sparking when hit with 0 damage items 
Fixes #1710
 2014-01-18 03:55:50 +04:00
Jittai
cf8871342a Whoops 2014-01-17 18:33:05 -05:00
Hornygranny
4a9c6a005d Added check for location 
Corrected wrong sprite variables in original
Added notices
 2014-01-17 15:11:35 -08:00
fleure
9e57eeb59b Merge pull request #2389 from Rolan7/HydroCargoPoints 
Hydro cargo points
 2014-01-17 15:10:47 -08:00
fleure
3662c3e5bf Merge pull request #2394 from hornygranny/master 
fix for Thirteen Loko recipe
 2014-01-17 14:56:23 -08:00
Jittai
f9cd65e424 Fixes Order of Operations 2014-01-17 17:20:41 -05:00
KazeEspada
f5ce877623 Merge branch 'master' of https://github.com/tgstation/-tg-station into papercups 2014-01-17 13:51:31 -07:00
Hornygranny
fd0b2551a8 Added indent to fix spawn 2014-01-17 12:24:47 -08:00
Hornygranny
d735e0f980 Fixes chameleon jumpsuit not flashing colors when EMPed 2014-01-17 12:19:14 -08:00
fleure
89bb6b8547 Merge pull request #2391 from ManeaterMildred/MechUpdate 
Mech Update : Gygax, Ion and Carbine
 2014-01-17 10:02:39 -08:00
KazeEspada
e6a11a2a6e adds a cup limit to the water cooler. 
Fixed a potential bug I may of caused involving reagent dispensor ex_act and blob_act.
 2014-01-17 09:58:47 -07:00
Miauw
9c68b28425 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-17 17:51:37 +01:00
JJRcop
36a346c367 Changes drying rack to use color var and removes "_dry" icons 
Removed watermelon's dried_state
Puts cigarette reagent code in a proc
 2014-01-17 11:26:24 -05:00
Hornygranny
c1727579e4 fix for Thirteen Loko recipe 2014-01-16 15:36:42 -08:00
Rolan7
50387aa9d4 Eggyseeds set to 0 rarity because they're in "exotic seed" crates from CentComm. 2014-01-16 17:33:28 -05:00