xxalpha
3316070ac0
Merge remote-tracking branch 'upstream/master' into putin
2016-02-05 01:27:26 +00:00
tkdrg
058f93a052
Merge pull request #14911 from MMMiracles/L6butbetter
...
local man rebalances bulldog and SAW, ruins everything
2016-02-04 21:59:28 -03:00
duncathan salt
d9672fa638
Merge pull request #15176 from ChangelingRain/fixedblobchemicals
...
Blob tweaks and a new blob chemical
2016-02-04 18:02:45 -06:00
Nerd Lord
f96290ff81
weakens death EMP
2016-02-04 18:54:01 -05:00
tkdrg
ba699024ab
Merge pull request #15204 from neersighted/hrefs
...
[s]Fix bad checks in holodeck
2016-02-04 20:03:30 -03:00
Bjorn Neergaard
ccc229a157
Fix bad checks in holodeck
2016-02-04 16:29:23 -06:00
xxalpha
cdef1324d3
Fixes var edited SMES starting with no charge.
2016-02-04 08:52:26 +00:00
KorPhaeron
8d4351fd04
Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue"
2016-02-03 22:03:22 -06:00
tkdrg
8b10c648e5
Merge pull request #15144 from lzimann/debugverbs
...
Makes debug verbs toggleable
2016-02-03 22:12:56 -03:00
tkdrg
6cf4feb348
Merge pull request #15137 from tgstation/Again-and-again-and-again-and-again-do-it-again-do-it-again-again-and-again
...
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
2016-02-03 22:10:01 -03:00
tkdrg
1c2727d765
Merge pull request #15133 from Firecage/Moremodulemoves
...
Moves some more files to the modules section.
2016-02-03 22:09:12 -03:00
tkdrg
0e7578fcea
Merge pull request #15132 from octareenroon91/patch-35
...
Improve player medbot
2016-02-03 22:03:30 -03:00
tkdrg
b1d431f243
Merge pull request #15129 from bgobandit/morevalentines
...
Adds more Valentine messages.
2016-02-03 22:01:46 -03:00
tkdrg
6f00a5d53f
Merge pull request #15147 from KorPhaeron/control_point
...
Fixes king of the hill not resetting properly
2016-02-03 21:49:51 -03:00
Nerd Lord
74bfcb02f6
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixedblobchemicals
2016-02-03 19:43:50 -05:00
Nerd Lord
af2e2da7cc
correct arg and var names, ho
2016-02-03 18:01:38 -05:00
Nerd Lord
7e372d65c3
Tweaks blob expansion to be faster near the expanding blob but slower near the edges of the blob
...
Blob spores now produce a slightly larger cloud of smoke when dying. Fragile spores and blob zombies produce the current, smaller cloud.
Replicating Foam will try to expand when damaged much more often.
Adds Electromagnetic Web, which does burn damage and EMPs targets, as well as causing a small EMP when dying, but takes more damage; a normal blob that hasn't been near a node or the core for 6~ seconds can be oneshotted by a laser.
2016-02-03 17:15:43 -05:00
Cheridan
213d324d5f
Merge pull request #15136 from Incoming5643/nonhumanunlessprovenotherwise
...
Command Roles are properly restricted to just humans
2016-02-02 22:28:18 -06:00
duncathan salt
0915bcf78c
Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot
...
carrot shivs strike back
2016-02-02 19:04:20 -06:00
MMMiracles
58c2972047
made AP rounds actually capable of denting people in bulletproof armor
2016-02-02 18:28:23 -05:00
KorPhaeron
0f39a20d4a
Machines are apparently not anchored by default
2016-02-01 22:40:22 -06:00
KorPhaeron
07ca64fdbb
King of the Hill Fixes
2016-02-01 22:11:46 -06:00
Lzimann
9b316eace2
Makes "Show debug verbs" toggleable
2016-02-02 01:34:53 -02:00
tkdrg
0f47866cad
Merge pull request #15122 from JJRcop/bugfixmoji
...
Fixes emoji issues to do with adminPM and OOC formatting
2016-02-01 19:44:16 -03:00
Razharas
6dd29e1211
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
...
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
2016-02-02 01:02:17 +03:00
Incoming
58f3f5207e
Command Roles are properly restricted to just humans instead of everything except lizards, catgrills, and plasmamemes (when the config is set for that).
2016-02-01 16:54:07 -05:00
Firecage
87efc42c13
Attempt to fix the issue with the single file
2016-02-01 20:48:10 +02:00
Firecage
34fdb1aafe
Moves the job code files to the Modules section.
2016-02-01 20:08:24 +02:00
octareenroon91
f8df0e43ed
Improve player medbot
...
🆑
rscadd: Player-controlled medibots can examine a patient to know what chems are in the patient's body.
/🆑
2016-02-01 12:05:17 -06:00
Firecage
dbc744d9ee
Moves the code for spells to the Modules section.
2016-02-01 19:33:44 +02:00
bgobandit
63bd7d4fed
colon never actually got in
2016-02-01 07:30:43 -05:00
bgobandit
e446e5f3ef
Adds more Valentine messages and colors.
2016-02-01 06:43:36 -05:00
tkdrg
f9885841f1
Merge pull request #15074 from Chiefwaffles/Slipocalypse
...
Adds Uplink Soap Clusterbang for 6TC
2016-02-01 00:01:33 -03:00
duncathan salt
ccba4396b1
Merge pull request #15105 from KorPhaeron/fish
...
Makes Cayenne a proper carp, adds sentience potion to nuke op uplink
2016-01-31 20:52:00 -06:00
Chiefwaffles
a4d5617289
Changed TC cost to 6.
2016-01-31 18:22:57 -08:00
tkdrg
0d3e68c1d0
Merge pull request #15099 from PKPenguin321/patch-12
...
Dice of Fate -> Die of Fate
2016-01-31 22:20:05 -03:00
tkdrg
5e00afd4cc
Merge pull request #14914 from PKPenguin321/is-that-a-knife-in-your-shoe-or-are-you-just-happy-to-OOF
...
Adds the ability to store knives/pens/edaggers in certain shoes
2016-01-31 22:00:43 -03:00
PKPenguin321
cdfefbf92b
fixes travis
...
o n e l i n e c o m m i t s
2016-01-31 16:26:21 -08:00
tkdrg
faa81107d6
Merge pull request #15079 from KorPhaeron/ctf_bugfix
...
CTF bugfixes and control point
2016-01-31 21:23:52 -03:00
KorPhaeron
b56879d21e
Parentheses
2016-01-31 18:16:05 -06:00
PKPenguin321
eeda4bbd04
updates var names, allows clown shoes to hold bike horns
...
zilenans around the globe, rejoice
2016-01-31 15:54:32 -08:00
PKPenguin321
616b24dda9
changes istype to is_type_in_list, adds a w_class check
...
also changes some var names to be less knife-specific and more item-specific
2016-01-31 15:52:11 -08:00
duncathan salt
52e60d80c9
Merge pull request #15089 from Firecage/atmos2modules
...
Take two of grouping the atmos files in modules.
2016-01-31 17:47:47 -06:00
KorPhaeron
aed4a51223
Restores factions to being lists
2016-01-31 17:46:01 -06:00
tkdrg
5b74ac82d7
Merge pull request #15031 from Fayrik/riseofthemachines
...
Adds pAI Control to Simple Robots
2016-01-31 19:02:52 -03:00
Fayrik
e199f81de2
This better be third time lucky.
2016-01-31 21:54:30 +00:00
tkdrg
013016d4f3
Merge pull request #14103 from bgobandit/valentinestuff
...
Adds valentines and candy hearts for Valentine's Day.
2016-01-31 18:49:28 -03:00
Fayrik
5548180158
Cardpulling works only once now, new proc, removed mulebot emag mode.
2016-01-31 21:12:50 +00:00
Remie Richards
0550e75804
Merge pull request #15039 from Thunder12345/stormtrooper
...
Adds Syndicate Stormtrooper mobs
2016-01-31 20:50:39 +00:00
Chiefwaffles
170b592377
Ups price to 4TC. Soap Spawnergrenade added to replace soap as payload.
2016-01-31 12:29:00 -08:00
