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

7271 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
b89d9c0849 Merge pull request #18336 from Militaires/nowormbranch 
removed redundant code for worm.dm
 2016-06-09 09:13:55 +12:00
KorPhaeron
befc25c5b0 Removes commented out code 2016-06-08 03:51:15 -05:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme 
Defers some list initializations
 2016-06-08 19:20:04 +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
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
AnturK
19eb97ae18 Moves some list initializations to New 
Fixes missing ..() calls in New()
 2016-06-07 18:39:13 +02: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
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
Xhuis
ab41d85354 Conflicts II 2016-06-06 21:31:38 -04: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
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
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
TechnoAlchemist
9ef7ca5ee6 Unique spectral sword sprite. (#18322) 2016-06-06 18:26:17 -05:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +12:00
GunHog
ab0bac909a Adds cooldown 
Minor cooldown added to avoid xenos being machine guns!
 2016-06-06 09:53:24 -05:00
Kyle Spier-Swenson
86c6a60021 Fixes ghost images not having byond member iconstates 
(these icon states will still not show if the user requests they don't see such things, but now should show when they do.)
 2016-06-06 01:58:22 -07:00
Joan Lung
f64e687250 Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix 2016-06-05 18:45:32 -04:00
Jack Edge
5fa854e252 Fixes a runtime when the AI uses binary chat 
Might fix some bugs? Bugs that I introduced, but phil mentioned a
runtime.
 2016-06-05 18:52:39 +01:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate. 
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
 2016-06-05 18:12:08 +02:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR 
Additional Ratvar conversion effects and related changes
 2016-06-06 01:35:26 +12:00
oranges
050c42ff5e Merge pull request #18174 from coiax/holodeck-cold 
Adds two new holodeck levels
 2016-06-06 01:23:43 +12:00
Nerd Lord
e816738280 Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 2016-06-05 09:03:22 -04:00
TechnoAlchemist
9db2f57f36 Kills me, fucking, like, blows my brains out or something. (#18231) 2016-06-05 03:10:13 -05:00
Joan Lung
4277d9bca2 Merge pull request #18215 from KorPhaeron/lava_staff_fix 
[s]Fixes lava staff being used through walls
 2016-06-04 20:48:50 -04:00
Joan Lung
715e97e4b0 Merge pull request #18151 from RemieRichards/SlimeAttack! 
Slimes may now be ordered to attack
 2016-06-04 17:25:34 -04:00
Joan Lung
d81db92008 Merge pull request #18214 from coiax/follow-link-define 
Refactors all (F) links into using a define
 2016-06-04 14:36:31 -04:00
phil235
bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor 
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
 2016-06-04 17:41:43 +02:00
Xhuis
28523c7199 Update to latest master 2016-06-04 11:41:22 -04:00
phil235
b482764a19 - I made human/handle_blood() less shitty. 
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
 2016-06-04 17:33:16 +02:00
Nerd Lord
9405446e08 important check 2016-06-04 11:20:59 -04:00
Nerd Lord
f8bd263eec Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 
Conflicts:
	icons/effects/effects.dmi
 2016-06-04 07:34:13 -04:00
Remie Richards
13dfd8dbf7 Peacekeepers now use Eye overlays, which means they close their eyes when they die :( (#18209) 
Peacekeepers now have Eye overlays for being servants of Ratvar
Redid some of the shading and lineart for colours for Peacekeepers
 2016-06-04 01:23:14 -05:00
Nerd Lord
3793e6187a Addition Ratvar conversion effects and related changes 2016-06-03 23:19:13 -04:00
Xhuis
cfc1ba6620 SSU tweaks/optimizations and alcohol changes 2016-06-03 20:58:04 -04:00
Joan Lung
6fd1424619 Merge pull request #18085 from Xhuis/earsplitting_string 
Clockwork Patch III
 2016-06-03 19:55:04 -04:00
Incoming5643
10313507be man I'm really slipping 2016-06-03 17:08:09 -04:00
Incoming5643
0bdc996ba0 The ghost of poly won't interfere directly in the lives of mortals 2016-06-03 16:58:41 -04:00
KorPhaeron
b7b4cc01ed Throwing Runtime Fix (#18076) 2016-06-03 22:22:03 +02:00
Xhuis
2b18993b04 Conflicts II 2016-06-03 15:42:19 -04:00