eb20908dcf
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
2014-01-13 14:08:57 -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
6dc7736933
Merge pull request #2244 from VistaPOWA/syndieborgs
...
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
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
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
c8120da49c
Merge pull request #2283 from YotaXP/list2text-refactor
...
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
cb0516f909
Corrected my own grammar failings.
2014-01-11 12:51:42 -05:00
0afe5c982d
merging upstream master into local repo
2014-01-11 17:14:48 +01:00
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
c1d228a96e
Merge pull request #2282 from Cheridan/Magic
...
Upgradeable Laser Pointers!
2014-01-11 06:09:19 -08:00
7b5e401ee6
Merge pull request #2275 from JJRcop/nuke-toy
...
Adds new nuke toy
2014-01-11 04:22:20 -08:00
c10d9b2611
fixing my fixes
2014-01-10 14:10:30 -06:00
397b2f07e8
fixes
2014-01-08 10:42:12 -06:00
0ef530326a
Minor nuke toy edit
...
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
2014-01-08 09:52:00 -05:00
f98a57b750
Optimized and refactored list2text, text2list, and replacetext.
...
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
937ac275ff
Upgradeable Laser Pointers!
...
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!
2014-01-07 19:54:51 -06:00
01f229a60d
Adds "surround" arg to playsound, which enables 3D sound
...
Defaulted to on
Also changes the toy nuke to use it
2014-01-07 17:45:12 -05:00
afd6b5fa22
Merge pull request #2266 from fleure/janradio
...
Gives janitor service headset
2014-01-07 08:37:24 -08:00
1300e3ebf3
Adds a visible_message to the nuke toy when it is used
2014-01-07 11:20:19 -05:00
1a58a3cf86
Merge pull request #2265 from fleure/watertank
...
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -08:00
9602bd2c14
Merge pull request #2256 from Aranclanos/RRpls
...
Half of the runtimes of four days here
2014-01-07 06:24:57 -08:00
45cb745b6b
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
...
Conflicts:
code/modules/projectiles/guns/magic.dm
2014-01-06 17:59:15 -08:00
58159a00ad
Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
...
Poker tables
2014-01-06 14:35:03 -08:00
94ef52e1cd
Adds new nuke toy, plays nuke sound when attack_self'd
...
Cooldown of 5 minutes
2014-01-06 16:46:12 -05:00
c50255107a
Gives janitor service headset
2014-01-06 18:51:22 +00:00
333d0ed045
Reduced watertank slowdown slightly
2014-01-06 18:26:06 +00:00
233a5b3b9b
Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs.
2014-01-06 06:34:17 -03:00
74f2edcb56
Makes the borg spawner and the contract a subtype of antag_spawner
2014-01-05 21:32:43 +01:00
2dcde243f3
Made the teleporter refundable
...
Also fixes a missing return
2014-01-05 17:29:34 +01:00
68afbbcc18
move along people, nothing to see here
2014-01-05 03:35:17 +01:00
fd34cea8ef
fixes the merging failure
...
hopefully that's it
2014-01-05 03:32:10 +01:00
443d6e2d9e
[MAP] Adds Syndicate Borgs
...
Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack
All weapons use 100 charge per shot.
2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
2014-01-05 03:13:40 +01:00
fe6f217d6f
Adds logging to emagged borgs using their stun arm.
2014-01-04 04:00:16 -06:00
09da906881
Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
...
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
3a11af405c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
...
Conflicts:
code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
be0f52b623
Fixed bruisepacks not working
2013-12-31 17:06:34 +00:00
f4542ee258
Scattershot ho!
2013-12-30 20:43:10 -08:00
b3d37e1d0a
Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum.
2013-12-31 16:50:17 +13:00
bb9c09df46
Obsoletes flags = FPRINT | TABLEPASS*
...
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.
Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.
If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
d5ddac3a00
Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
...
Cyber limbs fixes [FIXES #1920 ] + [Fixes #2180 ] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
e4b251a488
Adds different radio frequency colours for engineering, security, medical, service and supply.
2013-12-30 20:09:35 +13:00
d3d4c79946
Merges Heal_Damage and Heal_robotic_damage procs
...
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
53bfd06609
Fixes #2180 - Augmented limb healing issues
2013-12-29 16:12:32 +00:00
92636bbe01
Merge pull request #2168 from fleure/toolbox
...
Fixed toolbox parent object giving error
2013-12-29 08:00:11 -08:00
171147b1bf
Fixed toolbox parent object giving error
2013-12-28 14:51:35 +00:00
2482fd0702
Makes cards pocketable.
...
Adds w_classes to cards so you can actually pocket the things.
2013-12-27 15:49:21 -08:00
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
ef25332511
Merge pull request #2125 from Miauw62/ifitfeelsright
...
Folding boxes updates sprites properly
2013-12-26 20:13:09 -08:00
0c8c6a5de2
Fixed #1119 folding boxes updates sprites properly
2013-12-22 19:21:45 +01:00
0338a66c2a
Adds fingerprints to a bunch of stuff. De-texts computer build paths.
2013-12-22 18:57:33 +01:00
sirbayer
Cheridan
Giacom
dumpdavidson
YotaXP
VistaPOWA
JJRcop
Fleure
Aranclanos
AndroidSFV
Tenebrosity
Robson Richards
Rockdtben
Cluwnes Honk
Miauw