cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,710 Commits 61 Branches 14 Tags
7041877ebdfd6600a563b176374a2ad925edee52
Commit Graph

7337 Commits

Author SHA1 Message Date
oranges
9c451faa2c Merge pull request #18534 from Core0verload/ash_fix 
Fixes unkillable ash drake (+ more runtime fixes)
 2016-06-15 10:44:20 +12:00
Cheridan
70ca753d36 Merge pull request #18548 from GunHog/Bot_Say_Fix 
Fixes bot speech
 2016-06-14 17:02:30 -05:00
GunHog
3ddd840268 Mining Cyborg GPS (#18543) 
- Adds a GPS tool to mining cyborgs.
 2016-06-14 11:44:02 -05:00
KorPhaeron
11c42547d2 Too strong (#18487) 2016-06-14 15:23:08 +12:00
GunHog
c3cbea445e Bot Data HUD tweaks (#18505) 
Security bots now have a security HUD
Other bots have a Diagnostic HUD
Fixes Medical HUD not working for Medibots Fixes #17127
 2016-06-14 12:26:21 +12:00
oranges
f2790ba712 Merge pull request #18498 from KorPhaeron/megafauna2 
Fixes megafauna being immune to severity 1 explosions
 2016-06-14 09:22:24 +12:00
GunHog
16cad168a2 Fixes bot speech 
Bots now always have their robot spans.
 2016-06-13 16:06:17 -05:00
KorPhaeron
8dddcacf67 Whoops 2016-06-13 06:45:58 -05:00
c0
9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
c0
5ce52dbcb3 Fixes unkillable ash dragon 2016-06-13 12:17:57 +03:00
oranges
314c6846d3 Merge pull request #18483 from Xhuis/when_i_say_ill_do_something_i_do_it 
Adds caks
 2016-06-13 14:06:55 +12:00
Xhuis
295085f014 Heavily nerfs cak health 2016-06-12 19:01:54 -04:00
Xhuis
c095b2f976 Mind transfer and stat increase 2016-06-12 18:14:34 -04:00
oranges
d7c748a558 Merge pull request #18472 from phil235/HackyShit 
Fixes Synths
 2016-06-13 09:24:52 +12:00
Joan Lung
b689959a13 Merge pull request #18465 from Xhuis/left_laborer 
Two small clock cult fixes and a tweak
 2016-06-12 17:21:19 -04:00
KorPhaeron
b3b9e8b69e Fix 2016-06-12 09:39:00 -05:00
KorPhaeron
1f8cb5ef5e Megafauna bomb resist 2016-06-12 08:24:43 -05:00
Joan Lung
80f762c4f8 FALSE 2016-06-12 09:00:19 -04:00
Joan Lung
84a6edf527 Merge branch 'master' of https://github.com/tgstation/tgstation into gratuitouspenetration 
Conflicts:
	icons/effects/blood.dmi
 2016-06-12 08:37:13 -04:00
oranges
b20a5642de Merge pull request #18473 from RemieRichards/setDir() 
Set dir()
 2016-06-13 00:03:44 +12:00
Xhuis
e2cef7fca4 Fixes infinite donut duping 2016-06-11 21:11:15 -04:00
Xhuis
e467734e1f Adds caks 2016-06-11 20:23:40 -04:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
Cheridan
81e6679aed Merge pull request #18442 from drynwyn/Stupi 
Removes a superfluous addition of the "slime" faction to slimepeople.
 2016-06-11 13:14:13 -05:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Xhuis
771448ae93 Allows deconversion of drones 2016-06-11 13:25:54 -04:00
Joan Lung
a21fae2865 this is so ugly but the alternate choice is trying to fix all of /attack() in this pr 2016-06-11 12:41:14 -04:00
Joan Lung
3228d1d906 Revert "why didn't it do this before fuck oh my god" 
This reverts commit 1c19a6a2fb.
 2016-06-11 12:23:31 -04:00
phil235
9e5e525335 Fixes admantine golem female body icon. Now all golems have a female version. 
The wizard can no longer choose to become a military synth.
 2016-06-11 17:13:12 +02:00
phil235
cee58e55e7 All species now use the bodypart system to create their body sprite. 
Removes procs admin_set_species, update_base_icon_state, update_color.
Removes base_icon_state human var.
Fixes synth being invisible. The falling disguise effect is simplified by using special damage overlays.
Removes the SPECIES layer, it's now no longer used.
 2016-06-11 16:36:47 +02:00
Jordie
0777916328 Merge pull request #18402 from optimumtact/flamingfunremoval 
Better logging and notification of setting on fire
 2016-06-11 23:53:34 +10:00
oranges
29a1c6be5f Merge pull request #18433 from KorPhaeron/standard_borg 
New Standard Cyborg Module Gear
 2016-06-12 01:13:33 +12:00
oranges
f58b13d099 Explicitly return parent value 
This prevents it returning false incorrectly
 2016-06-11 13:09:25 +00:00
oranges
bf9643563d Ensure we only log and notify admins when person is set on fire 
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
 2016-06-11 13:08:05 +00:00
oranges
8141d5d60b Refactors IgniteMob to return true if the mob was set on fire 
Also moves the DNA species ignite mob check to a better proc name to
make it clearer that it checks for a mob species that is valid to set on
fire
 2016-06-11 13:04:09 +00:00
oranges
611151d25f Merge pull request #18278 from coiax/somebody-at-the-door 
Ghosts are notified when someone joins
 2016-06-12 00:40:57 +12:00
oranges
7063db51c9 Merge pull request #18424 from drynwyn/master 
Adds "plants" and "vines" factions to pod people
 2016-06-12 00:38:57 +12:00
Joan Lung
96990431be Merge pull request #18431 from coiax/fix-18351 
Deathrattle preferences fix; ignores Z2 deaths
 2016-06-11 08:18:13 -04:00
Joan Lung
1c19a6a2fb why didn't it do this before fuck oh my god 
shields can now block impaling
 2016-06-11 08:05:41 -04:00
Leo
467ce07292 No more leg-less full speed, hopefully. (#18417) 2016-06-11 12:35:09 +02:00
Xhuis
1c0b6172d9 Clockcult changes 2016-06-11 02:44:07 -04:00
Joan Lung
42c253d854 Merge pull request #18416 from KorPhaeron/megafauna 
Boss tweaks
 2016-06-10 21:04:39 -04:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1 
Fives Fixes
 2016-06-11 10:05:35 +12:00
drynwyn
24e0f6a333 Removes superfluous addition of the slime faction. 2016-06-10 13:36:25 -04:00
Jack Edge
beeced08be Ghosts are notified when someone joins 
🆑 coiax
rscadd: Ghosts are notified when someone arrives on the Arrivals
Shuttle. This is independent of the announcement system, and the (F)
link will follow the arrived person.
/🆑

Also I got rid of a trailing return.
 2016-06-10 17:17:26 +01:00
drynwyn
aa81f49540 Faction adding in species_gain rather than pod. 2016-06-10 11:12:11 -04:00
KorPhaeron
5893abc9bc Standard Cyborg Gear 2016-06-10 07:59:40 -05:00
KorPhaeron
6c287b4446 Nothing can go wrong 2016-06-10 07:57:59 -05:00
Jack Edge
5bb5d56ac3 Deathrattle preferences fix; ignores Z2 deaths 
Fixes #18351. Deathrattle preferences are now saved.

Deaths on Z2 are now no longer printed to deadchat.
 2016-06-10 13:13:28 +01:00
oranges
a726c30a7f Merge pull request #18397 from coiax/fix-18352 
Refactors slime names; altered slime, xeno names kept when evolving
 2016-06-10 20:03:43 +12:00