cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,619 Commits 61 Branches 14 Tags
5d931d70efedd7d48ff59cd5e5832a17edb0b620
Commit Graph

7695 Commits

Author SHA1 Message Date
Rolan7
5d931d70ef Larvae who chestburst while their host is swallowed are now properly added to stomach_contents, so they can be regurgitated. As are the gibs from the gibbing. 
Tidied up the loop in alien_powers.dm
 2014-01-20 15:43:43 -05:00
Rolan7
5f1fae05dd Gibbing now occurs in whatever the mob happens to be in, instead of fetching the turf. 2014-01-20 01:37:43 -05: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
fleure
6102e1f7ff Merge pull request #2417 from lokxy/master 
Fixes issue #1828 (Wizard Perma-Mutate)
 2014-01-19 03:56:46 -08:00
fleure
5f8314c5e4 Merge pull request #2420 from hornygranny/bomblog 
Syndicate bomb logging
 2014-01-19 03:50:21 -08: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
MrPerson
adbb273221 Merge pull request #2419 from KazeEspada/goodbyespaceworms2014 
removes space worms
 2014-01-18 23:24:22 -08:00
lokxy
12998c0641 Fixes issue #1828 (Wizard Perma-Mutate) 
Fixes Issue #1828 (Wizard Perma-Mutate)
- added centcomm check
 2014-01-19 03:13:17 +01:00
fleure
cd5fb384f0 Merge pull request #2409 from Rolan7/Issue112_Powersinks 
Fixes Issue 112, APCs not charging
 2014-01-18 17:30:02 -08:00
fleure
4efa6b3114 Merge pull request #2412 from Razharas/BorgAndGhostClickDragInventory 
Fixes borgs and ghosts storages
 2014-01-18 17:29:44 -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
fleure
e52c7106fb Merge pull request #2416 from Razharas/AutolatheFix 
Fixes autolathe checking wrong value
 2014-01-18 16:47:57 -08:00
fleure
e51027dbbb Merge pull request #2413 from hornygranny/sheetfixes 
Fixed typos in metal sheets/light tiles
 2014-01-18 16:00:34 -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
da0abda348 Merge pull request #2400 from hornygranny/summonlogging 
Summon guns/magic logging
 2014-01-17 23:02:46 -08:00
Cheridan
9468c30e05 Merge pull request #2374 from tgstation/501 
Merging 501 with Master.
 2014-01-17 21:33:46 -08:00
hornygranny
0a13b42170 Adds log reminding who primed a syndicate bomb when it explodes. 2014-01-17 20:04:47 -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
Razharas
78e2bf72cd Fixes autolathe checking wrong value 
Fixes #2415
 2014-01-18 04:48:07 +04: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
Hornygranny
01ce0f5392 Removed copypaste for cyborg metal sheets 
Fixed typos
 2014-01-17 15:45:09 -08:00
Jittai
cf8871342a Whoops 2014-01-17 18:33:05 -05:00
fleure
d6937897f1 Merge pull request #2399 from Glloyd/master 
Fixes the back icons for the scythe and the Roman shield.
 2014-01-17 15:23:57 -08:00
Razharas
0dcb8a8042 Fixes borgs and ghosts storages 
Fixes #2084
 2014-01-18 03:23:02 +04: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
Rolan7
f5267c22db Fixes Issue 112 which was due to powersinks draining cells without telling the APC, resulting in the APC believing itself to be full. 2014-01-17 17:21:38 -05: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
ManeaterMildred
2ded01ec03 Changed the Step battery drain, from 1 to 3. 2014-01-17 18:59:23 +01: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
Hornygranny
c095ec359e made it actually compile 2014-01-16 17:58:42 -08:00
Hornygranny
ec92b37f4f Now includes name and ckey. 2014-01-16 17:53:21 -08:00
Hornygranny
2f05dd4b9e Adds server logging for summon guns/magic. 2014-01-16 17:51:25 -08:00
Glloyd
b69ab81cc6 Resolves #2213 Fixes the back icons for the scythe and the Roman shield. 2014-01-16 20:23:36 -05:00
Hornygranny
c1727579e4 fix for Thirteen Loko recipe 2014-01-16 15:36:42 -08:00