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
34,543 Commits 61 Branches 14 Tags
3ec4b2bf23daca33cd8c2b016d0f7e0dbf37ba95
Commit Graph

15993 Commits

Author SHA1 Message Date
KorPhaeron
3ec4b2bf23 Cures zombies 2016-05-25 18:40:28 -05:00
Joan Lung
b19fbc4c5d Tweaks some layering (#17900) 2016-05-25 22:42:48 +02:00
Joan Lung
e021806f4c Swooping drakes are now properly immune to damage (#17893) 2016-05-25 22:41:19 +02:00
oranges
bc61c8a13d Merge pull request #17904 from coiax/renaming-the-annoying-ones 
Renames files under code/ with naughty characters
 2016-05-26 01:39:56 +12:00
Cheridan
c3df38a2bc Merge pull request #17926 from coiax/fix-17925 
Fixes observers being called ghost
 2016-05-25 01:37:09 -05:00
Cheridan
92d1ae5a4b Merge pull request #17881 from coiax/time-of-death 
Polymorph bugs, time since death, groundwork laid
 2016-05-25 01:29:44 -05:00
Jack Edge
5478a81ee4 foodndrinks to food_and_drinks 2016-05-25 06:26:28 +01:00
Jack Edge
6923c67cf0 Fixes observers being called ghost 
Fixes #17925.
 2016-05-25 06:15:19 +01:00
Xhuis
382c58cf23 Maybe now? 2016-05-24 18:25:20 -04:00
Cheridan
e2d231f918 Merge pull request #17890 from coiax/ghost-names 
Ghost name QoL changes
 2016-05-24 17:12:43 -05:00
Cheridan
6d6711facb Merge pull request #17822 from optimumtact/keepphilfromkillinme 
MakeSlippery proc made more readable with named arguments
 2016-05-24 11:59:24 -05:00
Jack Edge
d29af3a94b Independent blobbernauts 2016-05-24 17:28:34 +01:00
Jack Edge
afd9720abc Polymorph bugs, time since death, groundwork laid 
🆑 coiax
fix: Fixes bug where bolt of change to the host would kill an attached
guardian.
fix: Fixes bug where bolt of change to laughter demon would not release
its friends.
fix: Fixes bug where bolt of change to morphling would not release its
contents.
fix: Fixes bug where bolt of change transforming someone into a drone
would not give them hacked laws and vision.
rscadd: Medical scanners now inform the user if the dead subject is
within the (currently) 120 second defib window.
/🆑

- Also laid the groundwork for force pushing ghosts back into bodies
when defibbing, along with standardising the ghost back into body
process.
- Defib limit and defib brain loss times are now #defines.
 2016-05-24 17:28:34 +01:00
AnturK
7041152a37 Merge pull request #17846 from Incoming5643/patch-7 
Flips the bird
 2016-05-24 17:47:15 +02:00
AnturK
802cdf9f5c Merge pull request #17839 from optimumtact/watisgoinon 
Fix an antipattern when using canUseTopic
 2016-05-24 17:46:11 +02:00
AnturK
895406cd36 Merge pull request #17428 from Dahka/New_Syringes 
Adds three new syringes
 2016-05-24 17:37:40 +02:00
Jack Edge
0d6841b1ac Made Restore Ghost Character affect deadchat only 
Instead of altering the name of the ghost mob and mind, now it just lets
you babble in deadchat using your regular name with a special var.
 2016-05-24 15:04:04 +01:00
Jack Edge
7f49175967 Renames files under code/ with naughty characters 
Like seriously, don't use spaces in file names, this is a codebase,
they're annoying. Hopefully Github will show these renames correctly.
 2016-05-24 12:16:19 +01:00
Jordie
fa19b3a985 Merge pull request #17853 from ChangelingRain/suicidalshade 
Shades cannot suicide inside soulstones
 2016-05-24 10:47:47 +10:00
Jack Edge
9a15d97046 Ghost name QoL changes 
🆑 coiax
rscadd: Ghosts now have the "Restore Character Name" verb, which will set
their ghost appearance and name to their character preferences.
bugfix: Mob spawners now give any generated names to the mind of the
spawned mob, meaning ghosts will have the name they had in life.
the outsiders as they see fit.
/🆑

...

fsdjkafklasdfljk
 2016-05-23 23:00:26 +01:00
oranges
e7d5b506ee Merge pull request #17522 from Bobylein/chem_master-tgui 
Converted chemmaster to TGUI
 2016-05-24 09:39:17 +12:00
oranges
ed80a9d1fd Merge pull request #17816 from Core0verload/fix_pack 
Humble Fix Bundle
 2016-05-24 09:26:03 +12:00
Cheridan
47f6d58a2a Merge pull request #17886 from coiax/fix-spraaaaa 
Fixes some last minute spraycan bugs
 2016-05-23 15:26:49 -05:00
Kevin
540300939f Merge remote-tracking branch 'refs/remotes/tgstation/master' into chem_master-tgui 
# Conflicts:
#	tgui/assets/tgui.js
 2016-05-23 21:33:35 +02:00
Cheridan
603e7be1c8 Merge pull request #17868 from tgstation/SpaceFix 
Makes space 250 times less potent
 2016-05-23 14:28:44 -05:00
Jack Edge
1c92b17e3d Fixes some last minute spraycan bugs 
- Cyborgs can now use their spraycans
- Spraycans are different colours
 2016-05-23 20:26:40 +01:00
Cheridan
7f3cb0de5a Merge pull request #17815 from coiax/spraycan-of-doom 
Refactors crayons and spraycans
 2016-05-23 13:49:44 -05:00
Steelpoint
3f50399bda Red Security Sprites (#17784) 
* InitalCommit

* MergeConflict
 2016-05-23 11:04:52 -05:00
oranges
ccf693ae44 Merge pull request #17819 from Core0verload/toolbox_arm 
[#17310 Re-Open] "Toolbox Arm" printable at exosuit fabricators and protolathes
 2016-05-23 20:06:34 +12:00
oranges
1f6c9e34a4 Merge pull request #17830 from Bawhoppen/ertfix 
Fixes ERTs not spawning with correct stuff
 2016-05-23 18:45:07 +12:00
Cheridan
c94492664f MMmiracles away mission cleanup (#17873) 
* MMmiracles away mission cleanup

* tomb ruin fix
 2016-05-23 00:46:04 -05:00
oranges
aa873306ea Merge pull request #17824 from coiax/fix-17556 
Lone Operative event now works
 2016-05-23 16:40:09 +12:00
Razharas
f4a82e7054 Makes space 250 times less potent 
Fix https://github.com/tgstation/-tg-station/issues/17814
 2016-05-23 05:03:50 +03:00
oranges
4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace 
Peacekeeper Borgs
 2016-05-23 12:32:06 +12:00
Xhuis
0cbe194000 Conflicts IV 2016-05-22 15:06:01 -04:00
Xhuis
9db933124d Conflicts III 2016-05-22 15:05:00 -04:00
Xhuis
2bb832ca9c Conflicts II 2016-05-22 15:04:48 -04:00
Xhuis
af64baf257 A few changes 2016-05-22 14:58:29 -04:00
Joan Lung
42d262093a Merge pull request #17761 from KorPhaeron/death_message 
Changes simple animal death message
 2016-05-22 11:48:48 -04:00
KorPhaeron
d8f8458718 Nobody in this codebase can spell collapse 2016-05-22 10:35:00 -05:00
oranges
478b198810 Fixes hellwater reagent id (#17837) 2016-05-22 10:28:11 -05:00
Nerd Lord
96f3b6df6f Shades cannot suicide inside soulstones 2016-05-22 11:16:39 -04:00
Incoming5643
920ba3142a finishes the badminproofing of speech_buffer 2016-05-22 01:51:54 -04:00
Incoming5643
7d43330be4 Unbreaks the parrot 2016-05-22 01:35:14 -04:00
KorPhaeron
1130be3c1b Fixes weather killing everyone 2016-05-22 00:07:53 -05:00
oranges
a2223c25c3 Merge pull request #17801 from bgobandit/gibberagain 
The gibber produces properly named monkey meat.
 2016-05-22 13:11:22 +12:00
oranges
f2bf80843f MakeSlippery made more understandable by named args tweak 
Also used a max check to reduce lines of code slightly
 2016-05-22 00:42:11 +00:00
oranges
947e2c5c19 Fix an antipattern when using canUseTopic 
remove redundant range checks that are checked in the fixed canUseTopic
 2016-05-22 00:23:47 +00:00
bgobandit
e96a09a801 clarifies name 2016-05-21 19:29:20 -04:00
oranges
2bbc778899 Merge pull request #17759 from KorPhaeron/weather_immunity 
Weather Immunity Refactor
 2016-05-22 11:17:04 +12:00