cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,599 Commits 61 Branches 14 Tags
deb88e3b48ca1056155e6bb079d2012b84fdbc36
Commit Graph

7314 Commits

Author SHA1 Message Date
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
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
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
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
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
oranges
0bae93b2bf Merge pull request #18391 from GunHog/Dual_pAI_HUDs 
pAI data HUDs no longer conflict.
 2016-06-10 13:11:59 +12:00
KorPhaeron
aef1c2d044 Tweaks 2016-06-09 17:26:45 -05:00
phil235
219639e00b Using a multitool on telepad with open panel to save data no longer hits the machine. 
Packagewrapping a pulled item now properly stops the pulling.
Using put_in_hands() procs now properly checks if the mob has a hand.
bodyparts icon_state is now "" like it should be.
You can no longer build a firelock on top of another firelock.
You can reinforce a firelock assembly to build a heavy firlock.
Human species who breath something other than oxygen now get the proper alert when in crit, and I fixed the alert not being removed when healed.
 2016-06-09 20:46:00 +02:00
Jack Edge
4f8981c6a5 Refactors slime names; altered slime, xeno names kept when evolving 
Also fixes #18352.

Slime colour and adulthood are specified in New(), which is a lot better
than having an ugly spawn(0) in the middle of a New(). Slimes also only
update their names when growing or shrinking when it matches their
existing name format.

So if you happen to be a slime called Carl Lagerfield, it won't change
your name if you grow up to adulthood.

In addition non-standard xeno names are preserved while evolving.
And it also applies your old dir to the new xeno, because that looks
slightly better.
 2016-06-09 15:57:24 +01:00
AnturK
2f0a3919d2 Merge pull request #18368 from KorPhaeron/limbs 
Fixes explosive dismemberment not damaging limbs
 2016-06-09 10:55:14 +02:00
oranges
59b72ec25c Better logging and notification of setting on fire 
This also logs bump fire to the gamelog incase someone ever needs to
find out who set who on fire with bumping (left out of admin
notification) as it would be very spammy
 2016-06-09 06:31:23 +00:00
Joan Lung
14f92bb2b1 Megafauna can now properly smash walls (#18385) 2016-06-08 22:50:18 -05:00
oranges
c143e30ab5 Merge pull request #18350 from GunHog/AshTreaders 
Mining Cyborg Ash Storm Plating Upgrade
 2016-06-09 15:46:06 +12:00
oranges
6445deed2e Merge pull request #18360 from coiax/new-beacon 
Support guardian beacons are now structures
 2016-06-09 15:41:27 +12:00
oranges
a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know 
Renames and relores loyalty implants to mindshield implants.
 2016-06-09 15:39:53 +12:00
GunHog
6861940bb5 pAI data HUDs no longer conflict. 
You may now use both a medical and security HUD without issues.
 2016-06-08 19:10:51 -05:00
GunHog
5d517bc96a Fixes non-human carbons without DNA being shock immune (#18355) 
The CHECK_DNA_AND_SPECIES define (YES, A DEFINE) was causing the
electrocute_act() proc to terminate silently, with no runtime or
returned value.
 2016-06-08 17:19:48 -05:00
oranges
47cb6db5ae Merge pull request #18337 from KorPhaeron/bubblegum2 
Bubblegum
 2016-06-09 09:22:02 +12:00
oranges
b89d9c0849 Merge pull request #18336 from Militaires/nowormbranch 
removed redundant code for worm.dm
 2016-06-09 09:13:55 +12:00
KorPhaeron
83adeac43a Fixes explosive dismemberment not damaging limbs 2016-06-08 03:56:03 -05:00
KorPhaeron
befc25c5b0 Removes commented out code 2016-06-08 03:51:15 -05:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme 
Defers some list initializations
 2016-06-08 19:20:04 +12:00
GunHog
61b235d23c Merge remote-tracking branch 'remotes/upstream/master' into AshTreaders 
# Conflicts:
#	code/modules/research/designs/mechfabricator_designs.dm
 2016-06-07 18:37:38 -05:00
Sawu
dc20a94dd2 SNPC Updates (#18307) 
* SNPC Updates
* SNPCs now use their custom processing by default, with a few tweaks. This is a temporary fix to ensure they work appropriately until @MrStonedOne's MC is in place.
* SNPC custom processing will now watch for a failed loop and restart itself.
* Verb added for debugging SNPCs easily, must be enabled.
* SNPC customization now has three quick options, as well as the original choices.
* Spawns removed from laggier parts of doProcess(), now using waitfor instead
* Security SNPCs will target people set to arrest.
* Chefs, Botanists and Bartenders should now function more appropriately.

* Removes commented code

* Fixes an invalid loop

* REALLY fixes it this time
 2016-06-08 10:32:10 +12:00
Jack Edge
af46be2f22 Support guardian beacons are now structures 
- Now they'll no longer eat the turf to place themselves.
- Also tidied up the code a little.
 2016-06-07 23:25:05 +01:00
KorPhaeron
dd92987eb5 Blacklist spellbooks 2016-06-07 17:05:19 -05:00
oranges
e283f14c1c Merge pull request #18305 from MrStonedOne/patch-211 
Fixes ghost images not having byond member iconstates
 2016-06-08 09:10:19 +12:00
AnturK
19eb97ae18 Moves some list initializations to New 
Fixes missing ..() calls in New()
 2016-06-07 18:39:13 +02:00