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

4125 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
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
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
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
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
ManeaterMildred
4daac07f20 -Copypasted the old indentation and fixed the bullet path 
type because I'm dumb
 2014-01-16 23:01:40 +01:00
Rolan7
d7e77c44bc Updated a bunch of \blue and \red to span tags. 
Moves the seed check into the original loop along with plasma since sorting the seed list wasn't worthwhile.
 2014-01-16 15:44:56 -05:00
Cheridan
cfd9c1e1ee Merge pull request #2381 from Aranclanos/OreBoxes 
Mineral boxes, ore locations fix
 2014-01-16 12:44:56 -08:00
Miauw
6704a9948d Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-16 19:46:04 +01:00
ManeaterMildred
e24ce7681f Nerfed the incendiary bullets (The Mech Carbine ammo) to only 
5 Brute but retain his incendiary effect.
 2014-01-16 16:38:46 +01:00
ManeaterMildred
e965ab5b63 Changed the name of the Carbine to give a hint of his incendiary abilities. 2014-01-16 16:37:43 +01:00
Giacomand
9b9713f8d0 Fixes a bug. 2014-01-16 14:52:20 +00:00
Giacomand
11ce02ce3d * Fixed a typo. 2014-01-16 14:48:28 +00:00
Giacomand
aceb4b22e1 Removed the icon color blend operations from human's update_icons(). 
Changed all the hair/facial_hair/eye sprites to use a white base.
Changed the preview screen, in the preference menu, to use ICON_MULTIPLY to be able to use the new white sprites.
Removed the unused and broken cloaking item.
Ninjas now use the alpha variable, removed most of the checks for it.
Updated the documentation a bit.
Added some helper procs for later.
 2014-01-16 14:33:50 +00:00
fleure
088e9fb80a Merge pull request #2354 from Incoming5643/slimetime 
Slime Mob Refactor
 2014-01-16 06:20:03 -08:00
Rolan7
72ee3703fb Switched to an associative list for the list of discovered plants. 
Removed a grown-species lines I had commented out and forgotten to remove.
 2014-01-16 03:11:52 -05:00
Rolan7
aa21029431 Merge branch 'master' of https://github.com/tgstation/-tg-station into HydroCargoPoints 2014-01-16 01:21:33 -05:00
Rolan7
86c8b8ffa7 Fixes the species property for grown items by removing it (it wasn't being set by slimes or spawn, and was pointless). 
Removes some debug lines.
Puts the shuttle timer back to 1200.
 2014-01-16 01:20:56 -05:00
Aranclanos
470e323fda Mineral boxes will now handle properly the movements of the mineral ores when a player click on them with one. 
Fixes issue 2352
 2014-01-15 20:08:35 -03:00
Giacomand
ea5c85d4eb * Removed the icon operations from the kitty ears by removing their changing colour gimmick. 
* Removed hacky checks for the item.
 2014-01-15 22:01:37 +00:00
Giacomand
eeed4f136e Changed the base colour sprite for the chempuff.dmi 
Fixed a typo.
 2014-01-15 21:39:03 +00:00
Giacomand
11bca59614 Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable. 
The only noticeable gameplay difference is that you can't choose your graffiti's shade.
 2014-01-15 21:30:55 +00:00
Giacomand
a8b754f42f Merge branch 'master' of https://github.com/tgstation/-tg-station into 501 2014-01-15 19:01:15 +00:00
Giacomand
6e3a3ce549 Merge branch 'master' of https://github.com/Giacom/-tg-station into 501 
Conflicts:
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/modules/mob/living/carbon/human/life.dm
	icons/mob/screen_gen.dmi
 2014-01-15 18:32:55 +00:00