Cheridan
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
fleure
074ead1b40
Merge pull request #2345 from hornygranny/weakbullet
...
Weakbullet damage change
2014-01-14 10:41:34 -08:00
Cheridan
52afa566b3
Merge pull request #2331 from ManeaterMildred/HUDFeedback
...
Fixes Issue #1523 : No feedback when using F12.
2014-01-14 10:37:02 -08:00
fleure
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
fleure
2c74f1c085
Merge pull request #2341 from ManeaterMildred/MechDesign
...
Mech Weapons researching.
2014-01-14 09:33:10 -08:00
Aranclanos
8a56589e3e
Merge pull request #2292 from sirbayer/srsbsns-determinism
...
Remove RNG from armor
2014-01-14 05:01:24 -08:00
fleure
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
Jesus Hussein Chris
245dc52833
Removes unneeded code as pointed out by Cheridan. Thanks for the help.
2014-01-14 21:30:35 +13:00
Tenebrosity
73005ca982
Hopefully fixes Giacom's complaints
2014-01-14 13:18:13 +13:00
sirbayer
0829de6ffc
who added a damn cyborg crossbow jesus
2014-01-13 14:53:50 -08:00
Cheridan
a3760dfba1
Merge pull request #2311 from fleure/spider
...
Added spider meat, meals, and butchering
2014-01-13 14:21:20 -08:00
sirbayer
eb20908dcf
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
2014-01-13 14:08:57 -08:00
sirbayer
05f0b898b7
rechargestation.dm has some real colon cancer, man.
2014-01-13 14:08:38 -08:00
fleure
84ee1ca8b1
Merge pull request #2314 from Giacom/toxin_filter
...
Symptom Fixes.
2014-01-13 13:20:29 -08:00
fleure
ff70b47100
Merge pull request #2318 from Giacom/killing_me_softly
...
Tidied up the robotics computer code.
2014-01-13 12:11:56 -08:00
Giacom
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
Hornygranny
3c52f26750
extra line removed
2014-01-13 11:11:06 -08:00
Hornygranny
775728e20e
Beanbag damage lowered. .38 damage increased.
2014-01-13 11:08:19 -08:00
ManeaterMildred
c352312867
Added costs for the Mech Ion Rifle and the Mech Rocket Launcher.
2014-01-13 19:15:39 +01:00
ManeaterMildred
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
VistaPOWA
3ad69ef1da
Stops get_candidates from runtiming when it comes across and observer without a client
2014-01-13 16:23:23 +01:00
fleure
5766aec2aa
Merge pull request #2328 from Incoming5643/GlassCeiling
...
[Tumblr] Sausage Party Reduction
2014-01-13 01:57:19 -08:00
Cheridan
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
Jesus Hussein Chris
68a6131c22
Fixes bugs that prevent spawning dead slimes and dead monkeys before roundstart.
2014-01-13 12:38:31 +13:00
Jesus Hussein Chris
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
Tenebrosity
7b89ef11f4
Fixes a bug that prevents killing AIs before roundstart
2014-01-13 12:35:30 +13:00
VistaPOWA
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
Giacom
45d05c7866
Merge pull request #2321 from dumpdavidson/empfix
...
Fixes EMPs not working on humans.
2014-01-12 13:17:16 -08:00
Cheridan
0b2a1b7ac4
Merge pull request #2323 from dumpdavidson/empkit_balance
...
Balance changes to the EMP kit
2014-01-12 13:09:56 -08:00
ManeaterMildred
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
ManeaterMildred
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
Giacom
467c784580
Merge pull request #2303 from Bobylein/fixReviveOxyloss
...
Fixed #1605 oxyloss from suicide after admin revive.
2014-01-12 05:38:43 -08:00
Giacom
6dc7736933
Merge pull request #2244 from VistaPOWA/syndieborgs
...
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
Incoming
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
Rockdtben
d3f2befb54
Merge pull request #2293 from Faerdan/master
...
NanoUI Update
2014-01-11 13:42:32 -08:00
dumpdavidson
646df06cf9
moved when the emp_act is called in the afteratack proc of the emp flashlight
...
using absolute paths everywhere now.
adds a backslash to prevent "The the flashlight..."
2014-01-11 21:40:15 +01:00
Cheridan
d2a92b3063
Merge pull request #2260 from Giacom/recycler_emag
...
[MAP] Re-added the recycler's emag functionality and changed it so that it does massive brute damage and eats the person's equipped items
2014-01-11 12:27:13 -08:00
dumpdavidson
cf672d2c29
Balance changes to the EMP kit:
...
- EMP-Flashlight now has one charge less but recharges (slower than lasers/energy crossbows do)
- EMP-Flashlight description no longer reveals the nature of the device
- EMP implant now has two uses
- EMP kit now contains two grenades
- EMP and adrenaline implants now inform the user how many charges they contain to begin with (freedom doesn't because it's intentionally random)
- Fixes EMP flashlight sometimes going down to -1 charges.
2014-01-11 21:04:35 +01:00
dumpdavidson
8f49eee681
Fixes EMPs not working on humans.
2014-01-11 20:30:59 +01:00
Giacom
c8120da49c
Merge pull request #2283 from YotaXP/list2text-refactor
...
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
YotaXP
cb0516f909
Corrected my own grammar failings.
2014-01-11 12:51:42 -05:00
VistaPOWA
17095d3430
Adds additional check to syndieborg teleporter spawning, removes a redundant proc
2014-01-11 17:44:53 +01:00
VistaPOWA
0afe5c982d
merging upstream master into local repo
2014-01-11 17:14:48 +01:00
Aranclanos
baa86c8819
Merge pull request #2305 from Giacom/removed_set_background
...
Disabled the game using "set background" by making all instances of it use a define
2014-01-11 08:14:15 -08:00
Giacomand
7621973743
Tidied up the robotics computer code.
...
Removed exploits, such as being able to keep the input menu open to blow up borgs when you want.
Removed the obsolete global killswitch.
2014-01-11 16:12:18 +00:00
Aranclanos
2417d19141
Merge pull request #2299 from Giacom/damage_convert_fix
...
Fixes toxic compensation giving you toxins while at full health.
2014-01-11 08:08:37 -08:00
VistaPOWA
671b49cba1
Fixes the double-energy draw of the esword, makes the syndicate icon properly display for the borg.
2014-01-11 17:04:17 +01:00
Giacom
c1d228a96e
Merge pull request #2282 from Cheridan/Magic
...
Upgradeable Laser Pointers!
2014-01-11 06:09:19 -08:00
Giacomand
26d7a263bf
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2251
2014-01-11 14:06:36 +00:00
Giacomand
1a41abc609
The wire dialog will now properly close.
...
Refactored some of the code into procs.
Small feature: bombs tick louder when they are 10 seconds or less left, nuclear bombs were given the same treatment but with 20 seconds.
Fixed a bug with the syndicate bomb wire datum not using the CanUse().
2014-01-11 14:05:51 +00:00
