8aaf10feb4
Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets
...
Gun Revamp 2: Gun Harder: Director's Cut
2014-01-14 11:10:05 -08:00
24e06f64b7
Merge pull request #2360 from fleure/log
...
Updated changelog
2014-01-14 11:04:07 -08:00
c60422311b
Updated changelog
2014-01-14 19:01:26 +00:00
67c0eb6fcb
Merge pull request #2337 from Nienhaus/master
...
RD Alt outfit
2014-01-14 10:42:12 -08:00
074ead1b40
Merge pull request #2345 from hornygranny/weakbullet
...
Weakbullet damage change
2014-01-14 10:41:34 -08:00
52afa566b3
Merge pull request #2331 from ManeaterMildred/HUDFeedback
...
Fixes Issue #1523 : No feedback when using F12.
2014-01-14 10:37:02 -08:00
b6467378a2
Merge pull request #2304 from Giacom/emagged_destroy_mmi
...
Emagged Cyborgs, when destroyed via the Robotics Console, will not only have a large explosion but their MMI will die with them.
2014-01-14 10:34:46 -08:00
a34517f84f
Merge pull request #2359 from ManeaterMildred/Changelog
...
Added the design update -- PLEASE INSTA MERGE
2014-01-14 10:01:27 -08:00
5bf768d833
Added the design update -- PLEASE INSTA MERGE
2014-01-14 18:58:10 +01:00
2c74f1c085
Merge pull request #2341 from ManeaterMildred/MechDesign
...
Mech Weapons researching.
2014-01-14 09:33:10 -08:00
8a56589e3e
Merge pull request #2292 from sirbayer/srsbsns-determinism
...
Remove RNG from armor
2014-01-14 05:01:24 -08:00
62e4dbaf43
Merge pull request #2336 from Tenebrosity/deadmonkeyslimespawn
...
Fixes map corpse spawn bugs and expands on spawning corpses on the map
2014-01-14 03:16:01 -08:00
245dc52833
Removes unneeded code as pointed out by Cheridan. Thanks for the help.
2014-01-14 21:30:35 +13:00
73005ca982
Hopefully fixes Giacom's complaints
2014-01-14 13:18:13 +13:00
0829de6ffc
who added a damn cyborg crossbow jesus
2014-01-13 14:53:50 -08:00
a3760dfba1
Merge pull request #2311 from fleure/spider
...
Added spider meat, meals, and butchering
2014-01-13 14:21:20 -08:00
eb20908dcf
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
2014-01-13 14:08:57 -08:00
05f0b898b7
rechargestation.dm has some real colon cancer, man.
2014-01-13 14:08:38 -08:00
84ee1ca8b1
Merge pull request #2314 from Giacom/toxin_filter
...
Symptom Fixes.
2014-01-13 13:20:29 -08:00
07943b8807
Merge pull request #2329 from Giacom/read_me_tweak
...
Small update to the README so it has syntax highlighting in the code example
2014-01-13 12:15:34 -08:00
ff70b47100
Merge pull request #2318 from Giacom/killing_me_softly
...
Tidied up the robotics computer code.
2014-01-13 12:11:56 -08:00
bb8f5e928f
Merge pull request #2334 from VistaPOWA/syndieborg_emergency_fixes
...
Syndicate Borg emergency fixes (please merge and push to server quick before some shitler fucks over the entire op team just because lellaws)
2014-01-13 12:07:39 -08:00
3c52f26750
extra line removed
2014-01-13 11:11:06 -08:00
775728e20e
Beanbag damage lowered. .38 damage increased.
2014-01-13 11:08:19 -08:00
e178dc9293
Merge pull request #2325 from Incoming5643/bombplacement
...
[MAP] Adds a training bomb to armory
2014-01-13 10:49:33 -08:00
c352312867
Added costs for the Mech Ion Rifle and the Mech Rocket Launcher.
2014-01-13 19:15:39 +01:00
ab255fa65e
Merge pull request #2335 from Mloc/tg-travis
...
Added a .travis.yml file for Travis CI.
2014-01-13 09:34:49 -08:00
c41e3b5d17
Added the Mech Ion Rifle, Mech Carbine, Mech Rocket Launcher
...
and Ion Rifle to the list of things you can build with the
Protolathe and Exosuit Fabricator.
2014-01-13 16:33:00 +01:00
3ad69ef1da
Stops get_candidates from runtiming when it comes across and observer without a client
2014-01-13 16:23:23 +01:00
5766aec2aa
Merge pull request #2328 from Incoming5643/GlassCeiling
...
[Tumblr] Sausage Party Reduction
2014-01-13 01:57:19 -08:00
6eeb8149d8
Merge pull request #2306 from hornygranny/alienspit
...
Code by Giacom. Changes alien neurotoxin spit to dumbfire.
2014-01-12 23:42:36 -08:00
d7d9fa53ed
RD Alt outfit
...
Updates the icon
Image
http://puu.sh/6jei6
2014-01-12 23:23:59 -06:00
68a6131c22
Fixes bugs that prevent spawning dead slimes and dead monkeys before roundstart.
2014-01-13 12:38:31 +13:00
7d309d56ff
Adds the ability to spawn dead AIs, dead facehuggers and dead slimes on away mission maps. Expands on dead human spawning.
2014-01-13 12:37:18 +13:00
7b89ef11f4
Fixes a bug that prevents killing AIs before roundstart
2014-01-13 12:35:30 +13:00
01b4a0547c
Added a .travis.yml file for Travis CI.
...
This isn't used yet due to possible issues with existing PRs, but having
it on the repo will help.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-12 22:29:56 +00:00
0a9bc1ba13
Syndicate Borg emergency fixes
...
-Syndicate Borgs will no longer synch to AI
-Syndicate Borgs can no longer emag themselves
-Syndicate Borgs will get the proper faction assigned to them,
preventing viscerators from tearing them apart.
2014-01-12 23:20:57 +01:00
45d05c7866
Merge pull request #2321 from dumpdavidson/empfix
...
Fixes EMPs not working on humans.
2014-01-12 13:17:16 -08:00
0b2a1b7ac4
Merge pull request #2323 from dumpdavidson/empkit_balance
...
Balance changes to the EMP kit
2014-01-12 13:09:56 -08:00
ebff15a692
Merge pull request #2332 from VistaPOWA/syndieborg_changes
...
Syndicate Borg Changelog (PLEASE INSTA-MERGE)
2014-01-12 08:50:07 -08:00
6ac37c7a33
Syndicate Borg Changelog (PLEASE INSTA-MERGE)
2014-01-12 17:44:10 +01:00
3f485d4fb1
Added span class for the feedback, and the two warnings if you
...
try to use F12 when you shouldn't be able to.
2014-01-12 16:19:13 +01:00
e352012768
Add a feedback upon using F12, in case people get confused their
...
HUD is gone when pressing F12 by accident
2014-01-12 15:50:48 +01:00
467c784580
Merge pull request #2303 from Bobylein/fixReviveOxyloss
...
Fixed #1605 oxyloss from suicide after admin revive.
2014-01-12 05:38:43 -08:00
6dc7736933
Merge pull request #2244 from VistaPOWA/syndieborgs
...
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
67dad97125
Small update to the README so it has syntax highlighting in the code example. (DM is supposed to use C++'s highlighter)
2014-01-12 11:32:25 +00:00
f993585486
[tumblr approved] Sausage Party Reduction
...
*Lets adamantine golems and ninjas generate female where before they were generated exclusively male.
The ninja spacesuit has a coded in female variant that has existed forever but was not actually used. It only shows up upon suit ACTIVATION because (?:?:?)|\|i|\|j4c0d3(?:?:?).
Likewise female adamantine golems have their own sprites and can show up in staff of change shots, but ones generated from the rune were always male.
This does NOT effect admin summoned unknown humans, those are all still male.
2014-01-12 04:33:45 -05:00
7eedda656a
(sicsic)
...
THIS IS A GOOD USE OF COMMITS I TELL YOU HWUT
2014-01-11 18:48:16 -05:00
6d6e3f8c97
(sic)
2014-01-11 18:22:45 -05:00
6fa4ff9b96
Merge branch 'master' of https://github.com/tgstation/-tg-station into bombplacement
...
Conflicts:
maps/tgstation.2.1.2.dmm
Gia lied, people died
2014-01-11 17:13:47 -05:00
Cheridan
Giacom
fleure
ManeaterMildred
Aranclanos
Jesus Hussein Chris
Tenebrosity
sirbayer
Hornygranny
VistaPOWA
Nienhaus
Mloc-Argent
Incoming