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

16394 Commits

Author SHA1 Message Date
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
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
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
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
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
Core0verload
3af3bd2938 R&D machinery refactor (#18295) 
* RnD machinery refactor

* Small changes

* Removed designs selling
 2016-06-08 17:18:22 +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
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
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
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
erwgd
9602170884 Defines plant analyzer materials 2016-06-07 19:17:30 +01:00
AnturK
19eb97ae18 Moves some list initializations to New 
Fixes missing ..() calls in New()
 2016-06-07 18:39:13 +02:00
oranges
0187de935d Merge pull request #18300 from JJRcop/localhost_is_always_admin 
Localhost and .dmbs opened with dreamseeker always get admin
 2016-06-07 22:43:11 +12:00
Jack Edge
da134e2eeb Repulse sparkles now disappear 
It wasn't kevinz000's fault, it was mine.
 2016-06-07 11:20:44 +01:00
KorPhaeron
39bdefd9e6 Bubblegum 2016-06-07 03:43:20 -05:00
LatD
25827d6ccb [Ready] Tweaks some R&D levels (#18246) 
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
 2016-06-07 20:18:19 +12:00
militaires
18ce0776a2 removed space worm.dm 2016-06-07 10:35:46 +03:00
Fox-McCloud
4ce47d1a6f Experimentor Fixes 2016-06-07 02:10:44 -04:00
oranges
e06b7d52f2 Merge pull request #18205 from Steelpoint/Vest 
Vest Buff (Vest, Helmet, Warden Hat)
 2016-06-07 16:43:35 +12:00
Mike Long
b12a9fb7fc Refactor & nerf infernal jaunt. 
Infernal jaunt now has a warm up time for entering and exiting the jaunt.

Plus it looks nicer too.
 2016-06-06 23:01:23 -04:00
oranges
636b35bb5e Merge pull request #18291 from coiax/dragon-loot-moved 
Moved dragon loot into necropolis_chests.dm
 2016-06-07 14:59:56 +12:00
oranges
f338db8c28 Merge pull request #18223 from Incoming5643/patch-11 
The ghost of poly won't interfere directly in the lives of mortals
 2016-06-07 14:42:52 +12:00
oranges
f81634c2eb Merge pull request #18218 from Xhuis/rich_bears 
Fixes and tweaks
 2016-06-07 14:02:53 +12:00
Jack Edge
8cbb10cab2 Moved dragon loot into necropolis_chests.dm 
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275, lava staff can no longer turn transit tiles to lava.
 2016-06-07 02:57:12 +01:00
oranges
a1b0620c5f Merge pull request #18132 from GunHog/Aimed_Spit_For_Mista_Jay 
Aimed Neurotoxin Spit
 2016-06-07 13:54:04 +12:00
GunHog
48ce081d91 Mini fix 
Catches an oversight
 2016-06-06 20:53:19 -05:00
oranges
d360479227 Merge pull request #17934 from coiax/bluespace-shelter-templates 
Bluespace shelters use map templates
 2016-06-07 13:43:59 +12:00
oranges
76ab2582bf Merge pull request #18321 from Cruix/nukeops_war_fix 
[s] Fixes nuke ops being able to fly to the station and then declare war
 2016-06-07 13:32:49 +12:00
Xhuis
ab41d85354 Conflicts II 2016-06-06 21:31:38 -04:00
oranges
ef53e135e0 Merge pull request #18266 from MMMiracles/minipickers 
Adds compact pickaxes
 2016-06-07 13:23:26 +12:00
Jack Edge
a9b43f06bf Bluespace shelters use templates 
🆑 coiax
rscdel: Bluespace shelter capsules can no longer be used on shuttles.
rscadd: Bluespace shelters may have different capsules stored. View what
your capsule has inside by examining it.
/🆑
 2016-06-07 02:11:35 +01:00
oranges
c62e2ba11f Merge pull request #18264 from coiax/deathrattles 
Deadchat listeners will hear when people die
 2016-06-07 13:08:52 +12:00
oranges
78b73b5163 Merge pull request #18292 from ChangelingRain/mercyofRATVAR 
Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix
 2016-06-07 13:08:01 +12:00
GunHog
bfd644231f Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay 
# Conflicts:
#	code/modules/mob/living/living_defines.dm
#	icons/mob/actions.dmi
 2016-06-06 20:05:23 -05:00
oranges
017cd65250 Merge pull request #18047 from kevinz000/embraceTheMemes 
Reactive Table Armor - If you can't beat the memes, embrace them
 2016-06-07 13:03:08 +12:00
PKPenguin321
d3ba2473cc makes plant analyzers fit in belts again (#18324) 2016-06-06 20:01:51 -05:00
oranges
9d6936a607 Merge pull request #18197 from pudl/tank 
adds high-capacity watertanks
 2016-06-07 13:01:16 +12:00
oranges
04e882b365 Merge pull request #18259 from Iamgoofball/greytide 
Refactors the Prison Break event into the Grey Tide event
 2016-06-07 12:48:52 +12:00
Jack Edge
1c4e91d8b1 Deadchat listeners will hear when people die 
🆑 coiax
rscadd: Deadchat is now notified when a sentient mob dies.
/🆑

Includes the area name, because why not, I guess?
 2016-06-07 01:26:00 +01:00
Joan Lung
22aff568c6 but with conflictless sprites 2016-06-06 19:59:37 -04:00