cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,380 Commits 61 Branches 14 Tags
6f9168aee11bc1bf93db1eccd0bd91c3fb55ddb2
Commit Graph

28127 Commits

Author SHA1 Message Date
hornygranny
6f9168aee1 fixes godhand not deleting on drop 
fixes dismembering chaplains to steal the godhand
 2016-06-08 16:21:50 -07:00
Joan Lung
dc44d745f4 too lethal too lethal pull back (#18370) 2016-06-08 18:13:46 -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
236bb21c00 Merge pull request #18349 from sawu-tg/snpcs 
Adds the Bishop of Sin
 2016-06-09 09:16:34 +12:00
oranges
d5389459fb Merge pull request #18359 from lzimann/doublesharp 
Fix dual e-swords not being able to dismember
 2016-06-09 09:16:19 +12:00
oranges
bdc7d41804 Merge pull request #18357 from xxalpha/ifixallthefloors 
Repathed the floors of the rest of the station maps.
 2016-06-09 09:15:39 +12:00
oranges
ccb1ca96d0 Merge pull request #18356 from erwgd/MaterialsPlantAnalyzer 
Defines plant analyzer materials
 2016-06-09 09:15:15 +12:00
oranges
07bd09da5c Merge pull request #18340 from coiax/fix-18338 
Repulse sparkles now disappear
 2016-06-09 09:14:32 +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
oranges
7e73061793 Merge pull request #18334 from lordpidey/WHY_DOES_THIS_WORK_WTF_BBW_OMG 
Fixes random VV crashing.
 2016-06-09 09:12:36 +12:00
Sawu
c03f9f8bb0 Changes some numbers to defines 2016-06-09 07:09:18 +10:00
Mike Long
1fbd8d71f9 Merge remote-tracking branch 'tgstation/master' into jauntfix 
# Conflicts:
#	code/modules/spells/spell_types/demon.dm
 2016-06-08 13:20:04 -04:00
Lzimann
bd8f24f509 Moves sharpness and w_class after DNA check 2016-06-08 10:43:42 -03:00
Jordie
689cee4867 Merge pull request #18327 from ChangelingRain/mianaai_fragment 
Buffs anima fragments
 2016-06-08 21:16:29 +10:00
AnturK
05b9307a09 Merge pull request #18335 from Fox-McCloud/experimental 
Experimentor Fixes
 2016-06-08 13:14:57 +02:00
KorPhaeron
befc25c5b0 Removes commented out code 2016-06-08 03:51:15 -05:00
AnturK
a14fe0c18b Merge pull request #18323 from KorPhaeron/clown_buff 
Clown makes a sad trombone noise on death
 2016-06-08 10:47:56 +02:00
oranges
23e51b0881 Merge pull request #18319 from xxalpha/smooooooooooothlava 
SmoOoOoOoOoOoOoOoooOoooOoooOoths the lava.
 2016-06-08 19:23:27 +12:00
LatD
f3545d8d3b Balances pyro anomaly (#18310) 
* End damage buff

* Nerfs constant damage
 2016-06-08 19:23:10 +12:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme 
Defers some list initializations
 2016-06-08 19:20:04 +12:00
Sawu
99559af638 Small changes to Sins 
* Removes usage of traitors in Sins
* Adds two sin related weapons, with multiple functions depending on whether the sin was judged as good or bad.
 2016-06-08 17:05:15 +10:00
Core0verload
3af3bd2938 R&D machinery refactor (#18295) 
* RnD machinery refactor

* Small changes

* Removed designs selling
 2016-06-08 17:18:22 +12:00
Joan Lung
21945f5509 ) 2016-06-07 23:09:53 -04:00
Joan Lung
704c89ae02 hellish style choices 2016-06-07 22:59:20 -04:00
Joan Lung
2acdf638a7 a one character fix 2016-06-07 22:49:08 -04:00
Joan Lung
4fe317c21e i'm glad i caught that it might have been bad 2016-06-07 22:10:40 -04:00
Leo
cf27511dc9 Bar stool FIGHTS (#18325) 2016-06-08 13:29:47 +12:00
Lzimann
8f014d93ca Now they actually dismember 2016-06-07 21:35:12 -03:00
Cruix
5259e73f4d Fixes changelings readapting while in stasis removing the regenerate verb. (#18317) 2016-06-08 11:17:39 +12:00
PKPenguin321
b28da9cb97 Adds emag functions to chem dispensers (#18153) 
* adds emag functions to chem dispensers

* chemical changes, slight code changes

* fixes multiple emagging
 2016-06-08 11:09:25 +12: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
oranges
c65a4b3bd1 Merge pull request #18312 from MMMiracles/iamagoodcoder 
fixes previously implemented ruins
 2016-06-08 10:30:49 +12:00
KorPhaeron
dd92987eb5 Blacklist spellbooks 2016-06-07 17:05:19 -05:00
Joan Lung
55ac3ccb0f all of the fixes 2016-06-07 17:54:42 -04:00
Joan Lung
698210da02 fixathon 2016-06-07 17:48:52 -04:00
Joan Lung
6e64c697d7 more fixes 2016-06-07 17:47:12 -04:00
Lzimann
a16ce87454 Dual e-swords dismemberment 2016-06-07 18:15:56 -03:00
oranges
0408ffa9ba Merge pull request #18299 from PKPenguin321/patch-6 
fixes hulks attacking with dual eswords
 2016-06-08 09:11:18 +12: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
oranges
032b5473f8 Merge pull request #18306 from lzimann/lowpopmeme 
Number of nuke ops now scale with population
 2016-06-08 09:09:53 +12:00
Joan Lung
61c2d6aee0 Merge pull request #18279 from GunHog/Mining_Borgs_Need_Love_Too 
Mining Cyborg Hyper-Kenetic Accelerator Upgrade
 2016-06-07 17:09:39 -04:00
Joan Lung
b669940fda fixes a few machine bugs 2016-06-07 17:05:46 -04:00
xxalpha
9eaa9bb9bf Repathed Dreamstation, Efficiency, Ministation, Asteroid and Birdstation. 2016-06-07 21:11:27 +01:00
KorPhaeron
54c6b0e564 Fix 2016-06-07 15:03:16 -05:00
KorPhaeron
135012b101 Fix error in spawning colossus 2016-06-07 14:57:02 -05:00
Joan Lung
0e691081f8 stats panel 2016-06-07 15:54:10 -04:00
lordpidey
31281d7a23 Clarifies comment 2016-06-07 14:55:44 -04:00
erwgd
9602170884 Defines plant analyzer materials 2016-06-07 19:17:30 +01:00
Sawu
101ec9dfe3 Minor Fixes 
* Adds two new names for the Bishop of Sin
* Removes un-needed passes in reactions
* Changes If-else chain to a switch
* Lowers Gluttony's Nutriment to 1000
 2016-06-08 03:26:14 +10:00