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
35,625 Commits 61 Branches 14 Tags
e4d57634e47ac7ad6f46ef4b04a67128ffd690d0
Commit Graph

16507 Commits

Author SHA1 Message Date
Incoming
e4d57634e4 Merge branch 'master' of https://github.com/tgstation/-tg-station into no_bones_about_it 2016-06-12 17:55:22 -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
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
99620ffe76 Merge pull request #18481 from phil235/PlantsGunsShit 
Moving code around
 2016-06-13 00:14:29 +12:00
oranges
6eea6b4779 Merge pull request #18466 from Core0verload/proto_fix 
Fixes protolathe not accepting any reagents
 2016-06-13 00:08:14 +12:00
oranges
b20a5642de Merge pull request #18473 from RemieRichards/setDir() 
Set dir()
 2016-06-13 00:03:44 +12:00
oranges
fa9b86e64f Merge pull request #18458 from Razharas/KudzuFix 
Refactors kudzu on_hit processing, fixes bug
 2016-06-13 00:02:03 +12:00
oranges
11c76f5bd7 Merge pull request #18444 from xxalpha/spesstiem 
Wizard Spell: Spacetime Distortion
 2016-06-13 00:01:23 +12:00
Jordie0608
0846d6f30d fixes fire logging bracket 2016-06-12 20:58:55 +10:00
Xhuis
25a638d6af Removes cherry bombs (#18461) 2016-06-12 02:01:16 -05:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
phil235
dccc1e60a3 Let's not forget the new files. 
Also some tiny fixes, typo, and things I forgot.
 2016-06-11 23:52:35 +02:00
phil235
3b8af6f5ff Fixes grille/New() not calling ..() 
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
 2016-06-11 23:18:26 +02:00
Cheridan
47e2f50de5 Merge pull request #18440 from JStheguy/slave 
Easiest Fixes Ever Double Feature
 2016-06-11 13:29:44 -05: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
JStheguy
87ae4675fe Unhides Jumpsuits 
Wow, that was easier.
 2016-06-11 12:52:23 -05:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Remie Richards
a041255b80 Adds setDir(), a hook to for running code when a dir change occurs, replaces "dir = X" statements 2016-06-11 18:26:53 +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
Jordie
264aafbe23 Merge pull request #18378 from optimumtact/banditrevival 
Photocopying secret documents actually works now
 2016-06-11 23:52:02 +10:00
oranges
d97d8e6d6e Merge pull request #18432 from Core0verload/newmask 
Adds explorer gas mask for lavaland miners
 2016-06-12 01:14:48 +12: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
3bc56655e4 Rename proc, move updateUsrDialog call 
Ensures the dialog is called after the photocopy/doccopy is removed and
so the interface updates correctly
 2016-06-11 12:54:00 +00:00
oranges
39612b3ba2 Merge pull request #18430 from coiax/fix-18258 
Countdowns follow bomb; fixes syndibomb countdown
 2016-06-12 00:41:18 +12: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
c0
9357c24791 Fixes protolathe not accepting any reagents 2016-06-11 11:05:41 +03:00
c0
1a6fa0031d Adds explorer gas mask for lavaland miners 2016-06-11 10:38:53 +03: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
Razharas
c0273fc8cb Refactors kudzu on_hit processing, fixes bug 
Refactors kudzu on_hit processing, fixes bug
 2016-06-11 03:23:03 +03:00
Incoming
966516fb3f Adds the EASYDISMEMBER and EASYLIMBATTACHMENT specflags 
EASYDISMEMBER races have about double the chance to get dismembered when attacked with something that can dismember.

EASYLIMBATTACHMENT allows races with the flag to just shove limbs found lying on the floor into empty limb slots to regain their use. However this DOESN'T heal the damaged limbs, so in most cases doing this will actually add damage to the mob. Comically, the limbs attached don't need to be the originals, so these races can go around ripping off other peoples limbs and then using them for themselves.

Both these abilities are given to the the zombie and skeleton races, and constitute a significant nerf to lichs
 2016-06-10 19:52:33 -04:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1 
Fives Fixes
 2016-06-11 10:05:35 +12:00
oranges
b3bbe1aef3 Merge pull request #18414 from bgobandit/lizwine 
Adds lizard wine to the game.
 2016-06-11 10:05:17 +12:00
xxalpha
1a01acf4af Prevent the game from hanging if bullets find an infinite loop. 2016-06-10 19:47:55 +01:00
xxalpha
a33f30e87f Spacetime Distortion wizard spell. 2016-06-10 18:56:38 +01:00
drynwyn
24e0f6a333 Removes superfluous addition of the slime faction. 2016-06-10 13:36:25 -04:00