cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,170 Commits 57 Branches 14 Tags
7f642978effefbecb9a8a356f2cac0ee888c33ff
Commit Graph

29450 Commits

Author SHA1 Message Date
Shadowlight213
7f642978ef fixes 2016-07-26 14:03:43 -07:00
Shadowlight213
2d69b0ad19 Makes the hud work with borgs. 2016-07-26 13:46:16 -07:00
Shadowlight213
7a6f378e17 Merge branch 'master' of https://github.com/tgstation/tgstation into observehud 2016-07-26 11:53:23 -07:00
Cheridan
ae73924372 Merge pull request #19489 from XDTM/DefibFix 
Defib now checks for heart when used for heart attacks
 2016-07-26 12:44:22 -05:00
Thunder12345
1220d02aca Rapiers (#19340) 
* Adds Rapiers
 2016-07-26 15:14:11 +02:00
KorPhaeron
cc2673ec7d Can use staff of storms on station (#19486) 
* Staff of Storms on station

* Staff of (any) storms

* Fixes for summoning weather

* Removes extra line
 2016-07-26 21:32:21 +12:00
oranges
4b841c01ce Merge pull request #19483 from ChangelingRain/iwantthemwithinandwithoutmeallthroughandaboutmeiwantfeathersinmylungsandeyesonmyskiniwantmyhearttoseeandmylungstofly 
Halves the Interdiction Lens' disrupt cost
 2016-07-26 21:31:48 +12:00
oranges
bf3c079a94 Merge pull request #19478 from ModernViolence/ModernViolence/fix#19440 
Fixed #19440 - Hulk now has default cooldown for melee attacks against dominator
 2016-07-26 21:30:38 +12:00
Cheridan
f7bd324425 Merge pull request #19474 from ChangelingRain/forvengeancefordesirefor_pleaselistentome_ 
Wraith Spectacles can now be safely used for 50% longer
 2016-07-26 01:06:32 -05:00
Cheridan
755b6cd695 Merge pull request #19484 from Jordie0608/wecouldtotallyhookthisbuttonuptothef5key 
Refresh page button for admin notes window
 2016-07-26 01:01:16 -05:00
AnturK
f118b0d2d1 Fixes retrieval not working (#19479) 2016-07-25 18:02:10 -04:00
oranges
f7c0d39c3e Merge pull request #19469 from Iamgoofball/patch-89 
Unused Traitor Items: Powerfist
 2016-07-26 09:40:32 +12:00
ma44
6fe50a3601 Indentation fix for #19477 (Saltpetre rounding bug fix + tweak) (#19482) 
* Update hydroponics.dm

* Update hydroponics.dm

* Update hydroponics.dm
 2016-07-25 22:52:48 +02:00
Cheridan
cd4a22f6bc Merge pull request #19473 from ChangelingRain/thehumidityisthickwithhandswefeelthesweatpeelingoffofusandthehandsgraspingthedevilcomesinheatnotlikeachillinthemiddleofthenightthedevilstickstoyourskinandseepsinyourpores 
Fixes an exploit that could allow you to recite locked scripture
 2016-07-25 13:24:42 -05:00
XDTM
27d7f703f4 Defib now checks for heart 2016-07-25 12:21:56 +02:00
oranges
665783f0fa Merge pull request #19455 from Incoming5643/patch-15 
Doubles the amount of viscerators in the viscerator grenade
 2016-07-25 21:17:47 +12:00
oranges
ac1b15f41c Merge pull request #19461 from KorPhaeron/jobbans 
Adds jobbans for lavaland spawners
 2016-07-25 21:15:48 +12:00
oranges
8be61f8a80 Merge pull request #19458 from KorPhaeron/immortality 
Add action button to immortality talisman
 2016-07-25 21:15:21 +12:00
oranges
ee2f1f652f Merge pull request #19457 from KorPhaeron/gib 
Fixes being unable to gib changelings with flesh disguise
 2016-07-25 21:15:11 +12:00
oranges
0982784d97 Merge pull request #19456 from KorPhaeron/spike 
Fixes being unable to remove people from meatspikes
 2016-07-25 21:14:48 +12:00
Incoming5643
c3f5870df5 Adds limb destroyer behavior to hostile mobs. (#19451) 
* Adds limb destroyer behavior to hostile mobs. Mobs with this behavior will (usually [thanks proc/ran_zone]) attack the weakest limb of a mob until it gets dismembered

Adds ishostile() for this pretty specific situation

Behavior added to viscerators

* Generalizes the ability to dismember with an unarmed strike to living

* Gives xenos limb_destroyer at WJohn consultation

If a monkey or a human is var edited to have destroyer, that works now

fixes a potential runtime
 2016-07-25 21:14:28 +12:00
PKPenguin321
b325df3e6e Canned Laughter Improvements (#19446) 
* ports improvement from hippie
https://github.com/HippieStationCode/HippieStation13/pull/2657

* fixes last commit, makes laughter brewable
 2016-07-25 21:14:13 +12:00
Joan Lung
51a40ed9b8 Clockwork mob buffs (#19443) 
* Clockwork mob buffs

* watertogiveandthirsttotake

* nothing can escape this flood
 2016-07-25 21:13:42 +12:00
JJRcop
9419a620c4 Refactors chronosuit (#19441) 
Chronosuit now uses addtimer, underlays, and forceMove (incidentally this means you can slip if you teleport on top of soap)
Added Weaken(10) to mid-teleport EMP debuffs
 2016-07-25 21:12:38 +12:00
NikNakFlak
1f6d41bc28 Color variables for scarves/beanie fix (#19438) 
* Does some stuff

* Fixes ties on humans and corgis not applying color and alpha to the overlays

* Renames /datum/dog_fashion vars to reduce confusion
Also fixes issue introduced in d2fd3f36918b9abfa833b75fda8af3c124c85336 where custom DF icon_states (now obj_icon_state) would not carry over to the corgi

* Fixes consistency mess up with dog_fashion
caused by 2595ce2d322cd74653eca2be43f79ad63104e61a
 2016-07-25 10:23:34 +02:00
Joan Lung
5041449faa Knocking the invoker of Nzcrentr unconscious or killing them will prevent lighting blasts (#19435) 
* Knocking the invoker of Nzcrentr unconscious or killing them will prevent lighting blasts

* thunder
 2016-07-25 10:21:54 +02:00
Cruix
98688abe2d Fixes Photos (#19427) 
* Fixed photos not displaying atoms with a dir that their icon does not have.
Fixed photo descriptions describing mobs with low max health as being hurt when they were not.

* Fixed direction issue.
 2016-07-25 09:55:26 +02:00
Joan Lung
e7171ed2b1 Converting an AI to Ratvar's cause immediately converts all of its connected cyborgs (#19425) 
* Converting an AI to Ratvar's cause immediately converts all of its connected cyborgs

* let myself out

* let ourselves out
 2016-07-25 09:54:17 +02:00
Joan Lung
26b1ad64f9 Fixes clockwork cult objective printout (#19448) 
* Fixes clockwork cult objective printout

* what am I supposed to do...

* touchbetouched

* ask
 2016-07-25 08:43:18 +02:00
MMMiracles
c53843d348 Adds Jump Boots (#19436) 
* i surf professionally

* stuff changes

* buff, upgrades, and some other things

* action button desc update

* >burn_state = true

* rip larva

* fak
 2016-07-24 22:43:48 -04:00
Jordie0608
a774e60a78 refresh page for notes window 2016-07-25 11:08:22 +10:00
Joan Lung
6ab7f8b9fd Halves the Interdiction Lens' disrupt cost 2016-07-24 18:41:26 -04:00
Paxton Prescott
3647b1b145 Fixed #19440 - Hulk now has default cooldown for melee attacks against dominator 2016-07-25 00:03:25 +05:00
Joan Lung
8ee6719bf2 Wraith Spectacles can now be safely used for 50% longer 2016-07-24 09:48:46 -04:00
Joan Lung
16ac229cdb please ask me 2016-07-24 09:39:48 -04:00
Joan Lung
51b9263919 Fixes an exploit that could allow you to recite locked scripture 2016-07-24 09:37:57 -04:00
Iamgoofball
758d77efdb Unused Traitor Items: Powerfist 
not enough damage tbh, 3% usage
 2016-07-24 04:48:08 -07:00
Cheridan
87369932cc Merge pull request #19434 from ChangelingRain/idontwanttobestrongidontwanttobethatsortofpersonatallthelightsintheedgeofmyeyesiwanttoseethemsomuchtheyresohorribleicantlookaway 
Fixes the Ratvarian escape objective's scaling
 2016-07-24 01:29:47 -05:00
KorPhaeron
c9caeb8e17 Jobban 2016-07-23 22:56:45 -05:00
KorPhaeron
376936e55b Add action button to immortality talisman 2016-07-23 21:59:14 -05:00
KorPhaeron
0382041796 Remove people from spikes properly 2016-07-23 21:49:27 -05:00
KorPhaeron
f41daf05c3 Flesh Clothes 2016-07-23 21:44:35 -05:00
Incoming5643
d7de116d28 Doubles the ammount of viscerators in the viscerator grenade 
As per request
 2016-07-23 21:40:54 -04:00
Joan Lung
e8ee3a0008 Merge pull request #19437 from ma44/master 
Makes Saltpetre a thing for Botanists now
 2016-07-23 20:50:20 -04:00
Joan Lung
e6259d32e3 Merge pull request #19406 from Niknakflak/ImABigBoyNow 
Makes crayons not racist anymore
 2016-07-23 18:40:10 -04:00
Joan Lung
afc73ef4f1 Merge pull request #19432 from KorPhaeron/morgue_fix 
Morgue Light Fix
 2016-07-23 18:39:42 -04:00
Joan Lung
aa1a19df63 i gotta 2016-07-23 18:31:03 -04:00
GunHog
6a84c1c9c6 Bluespace polycrystal tech fix (#19447) 2016-07-23 17:13:19 -04:00
ma44
77efba7837 Update hydroponics.dm 2016-07-23 12:57:20 -05:00
Cheridan
fef0d6aa16 Merge pull request #19430 from ChangelingRain/iamtryingtofuckupvenusfortherestofhisentirelifeandyoutooifyouletmeandifyouwanttostopthatiguessthereisaproblemandyouwillhavetokillme 
Fixes component messages
 2016-07-23 11:27:23 -05:00