Jordie0608
94344cd471
changes gold slime core hostile mob list to whitelist
2015-08-19 21:10:36 +10:00
Jordie
a5c274cbc7
Merge pull request #11262 from KorPhaeron/standproud
...
Guardian Updates
2015-08-19 19:53:13 +10:00
Swag McYolosteinen
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
KorPhaeron
4fd1b7f20f
Merge branch 'standproud' of https://github.com/KorPhaeron/kortg into standproud
2015-08-19 04:38:26 -05:00
KorPhaeron
bac3cc0b6d
Changelog
2015-08-19 04:38:11 -05:00
Jordie
bdd6a75382
Merge pull request #11119 from phil235/VaporizeMethodReaction
...
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
Jordie
4463c59849
Merge pull request #11221 from Core0verload/spawnpanel
...
Spawn panel improvements
2015-08-19 19:01:15 +10:00
Jordie
6d5a0ade7f
Merge pull request #11259 from Aranclanos/disposalstuff
...
Some disposal fixes
2015-08-19 18:59:32 +10:00
Jordie
6ad79827dd
Merge pull request #11260 from KorPhaeron/xenobiofix
...
Fixes guardians spawning in xenobio
2015-08-19 18:59:13 +10:00
Jordie
5e430b3384
span4cheri
2015-08-19 17:18:13 +10:00
Jordie0608
c2d7dff564
Merge branch 'master' of https://github.com/tgstation/-tg-station into despitebestattemptsthedeweydecimalsystemhasnotyetbeenadaptedtoworkwithsql
...
Conflicts:
README.md
2015-08-19 15:27:26 +10:00
Jordie0608
5be606c18e
injection fixes
2015-08-19 15:09:59 +10:00
Kyle Spier-Swenson
8f1c084d23
Fixes pulling bug that led to FUN!
...
QUICK MERGE, MAJOR FUN REMOVAL.
2015-08-18 21:12:08 -07:00
Remie Richards
271b7344f5
Merge pull request #11045 from KorPhaeron/survivalpod
...
Survivalpod
2015-08-18 20:50:18 +01:00
Remie Richards
f2cf448d4e
Merge pull request #11245 from Aranclanos/alienfacehuggerhud
...
Fixes the alien hud icon for infected people not appearing.
2015-08-18 20:39:33 +01:00
Remie Richards
1595538788
Merge pull request #11244 from Aranclanos/mimicranged
...
some mimic ranged mob fixes
2015-08-18 20:38:55 +01:00
Remie Richards
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
Remie Richards
f77047b640
Merge pull request #11185 from Cheridan/brycepaxsbrain
...
Logging Syntax Improvement
2015-08-18 20:24:42 +01:00
Remie Richards
3891e67d8d
Merge pull request #11162 from Core0verload/rnd-implants
...
RnD update
2015-08-18 20:20:12 +01:00
KorPhaeron
ba3ec31deb
Toggle fixes
2015-08-18 12:15:40 -05:00
KorPhaeron
0f6a9ba19b
Fix
2015-08-18 05:04:57 -05:00
KorPhaeron
30ce209f8d
Guardian Updates
2015-08-18 04:31:46 -05:00
KorPhaeron
60715b1659
On second thought I'm removing scout anyway
2015-08-18 04:20:09 -05:00
KorPhaeron
54a32d21c2
Comma
2015-08-18 02:21:08 -05:00
KorPhaeron
c4fad66eb4
Update Chemistry-Recipes.dm
2015-08-18 02:05:41 -05:00
Aranclanos
1d9bf04edc
Adds a Destroy() for the disposal pipe trunk.
...
Fixes vent_gas() from the disposal holder from trying to update the air while GCed
2015-08-18 03:02:09 -03:00
Cheridan
552a534a27
Merge pull request #11242 from Firecage/SyndicateCarbine
...
This fixes the Syndicate Carbine.
2015-08-17 23:51:53 -05:00
Nerd Lord
f4791fa6c4
REVENANTS MILDLY LESS COMMON.
...
I'm not all that surprised they were too common, I set this pretty generously.
2015-08-17 18:51:09 -04:00
Jordie0608
e4b21e30d3
autoconvert notes to sql procs
2015-08-17 15:24:50 +10:00
Aranclanos
0dbc04d6a7
Fixes the alien hud icon for infected people not appearing.
...
If a mob is infected by a changeling egg, aliens won't get the hud icon.
2015-08-16 21:34:53 -03:00
Aranclanos
45e484f072
Mimic ranged crates will spawn as their parent if they are not created by a staff of animation.
...
Cleans a bit mimic.dm, copypaste and some bad code (like spawning some projectile types just to get a variable)
2015-08-16 20:26:45 -03:00
Firecage
2ee2c8513e
This fixes the Syndicate Carbine.
2015-08-17 00:51:23 +02:00
Nerd Lord
89f79a1397
Hopefully fixes #11238 by removing the strike code, overload lights now causes sparks, window to put someone into a revenant increased to 10 seconds.
2015-08-16 18:36:12 -04:00
Firecage
bf13763e3b
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel
2015-08-16 23:34:03 +02:00
Firecage
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02:00
Remie Richards
f6aa26ae75
Merge pull request #11187 from Anonus/atleastthiswon'tconflict
...
Buffs revenants a whole bunch so they're less terrible to play
2015-08-16 21:19:55 +01:00
Nerd Lord
2e4a5844f0
PROPER FIX: CHECK
...
MAX(0, ESSENCE): CHECK
2015-08-16 16:16:46 -04:00
KorPhaeron
fece9cf524
I forgot how my own code worked
2015-08-16 10:49:51 -05:00
phil235
5539689f3a
Merge pull request #11043 from KorPhaeron/moreweebshit
...
Timestop for Wizards
2015-08-16 11:04:47 +02:00
KorPhaeron
0abd08cb92
Did it the way Phil wanted it
2015-08-15 22:00:15 -05:00
KorPhaeron
dcee74e952
Fixed the src.loc stuff
2015-08-15 21:41:19 -05:00
phil235
8a4f8a4482
Revert "Adds 15-force edaggers that look and function like pens when off."
2015-08-16 00:36:08 +02:00
phil235
df758d2fff
Merge pull request #11146 from MMMiracles/biomemes
...
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
phil235
bc6ffdcf31
Merge pull request #11194 from Aranclanos/wabbajack
...
The staff of change projectile will qdel the mob instead of manually …
2015-08-15 22:28:27 +02:00
phil235
7d9a9f1324
Readds blob smoke reagent effect.
...
You can now partially (max is 50%) protect yourself again blob reagent effects (blob smoke and blob attack). Although some effects are unaffected (explosion probability, vortex power, adding fire_stacks).
Changes the "volume" argument used in reaction_mob() to "reac_volume" to avoid confusion with the "volume" variable.
Buffed blob smoke reagent amount from 5 to 10 to counterbalance the nerf from clothes protection.
Blob direct attack now uses the VAPOR method.
2015-08-15 20:56:56 +02:00
phil235
64f028c065
Merge branch 'master' of https://github.com/tgstation/-tg-station into VaporizeMethodReaction
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
2015-08-15 16:36:21 +02:00
phil235
06b94738fa
Merge pull request #11182 from Miauw62/death
...
Makes patches not work on dead people.
2015-08-15 16:17:24 +02:00
phil235
907031df61
Merge pull request #11202 from Miauw62/alanedaggerpoe
...
Adds 15-force edaggers that look and function like pens when off.
2015-08-15 16:16:30 +02:00
Jordie0608
9e2c59ca24
debug fix
2015-08-15 22:34:18 +10:00
Jordie0608
e2d3488f7f
database notes
2015-08-15 22:24:24 +10:00
