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
2c74f1c085
Merge pull request #2341 from ManeaterMildred/MechDesign
...
Mech Weapons researching.
2014-01-14 09:33:10 -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
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
c352312867
Added costs for the Mech Ion Rifle and the Mech Rocket Launcher.
2014-01-13 19:15:39 +01: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
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
d3f2befb54
Merge pull request #2293 from Faerdan/master
...
NanoUI Update
2014-01-11 13:42:32 -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
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
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
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
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
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
26d7a263bf
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2251
2014-01-11 14:06:36 +00:00
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
03eea5642c
Merge pull request #2257 from errorage/2014_01_06_borg_module_ui_update
...
Cyborg module selection UI update
2014-01-11 04:33:03 -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
f1e7637bab
Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm
...
Testing has revealed that it reduces the sluggishness of the game, though it will spike from lag when the singularity is loose. Thanks to ChuckTheSheep for suggesting it.
Server owners who want to keep set background enabled can do so by changing the define.
2014-01-10 18:32:28 +00:00
4304107d26
Merge pull request #2242 from ChuckTheSheep/Morgue-Changes
...
Morgue Changes
2014-01-10 08:19:33 -08:00
5d177d8079
Merge branch 'master' of https://github.com/tgstation/-tg-station into recycler_emag
...
Conflicts:
maps/tgstation.2.1.2.dmm
Fixed the map of the mineral machinery input/output bugs.
2014-01-10 13:19:56 +00:00
769e9dd9a7
Merge pull request #2137 from Rumia29/23/12/2013-rdaltuniform
...
Adds an alt RD uniform to the RDs locker
2014-01-10 00:52:09 -08:00
3d6eb6dd3d
Fixed tables not working
2014-01-09 18:54:54 -03:00
fef1a108fb
Merge branch 'master' of https://github.com/tgstation/-tg-station
2014-01-09 01:03:40 +00:00
53b2d2e928
NanoUI Update
...
* Refactored the code used in the ui_interact procs to be neater and easy to understand (also less code duplication). Updated all existing ui_interact procs to match.
* Rebuilt (and simplified) template rendering system, removed data-linking (the use of carets "^" in templates) and the need to send the full data structure every update (just send whatever you want now, it's fully dynamic). Updated all existing templates to match.
* Restructured HTML and JavaScript to increase compatibility with IE (this fixes "blank uis" for many users).
* Increased the number of error messages to help diagnose issues.
* Multiple performance improvements, especially when updating an open ui.
* Added the ability to update a ui for an individual user (nanomanager update_user_uis proc, used for things like realtime messages in Bay's PDA).
* Added a "Loading..." notice to the UI. If this stays then your JavaScript isn't enabled.
* Removed redundant wip apc.tmpl file.
* Added a link to the online docs in TemplatesGuide.txt.
2014-01-09 01:02:13 +00:00
8e050332d6
Cleans up the for() and list handling in update.
2014-01-08 18:12:17 -05:00
cac61b9d0c
Merge pull request #2273 from Razharas/WhyAIsDontHaveMentalInterfaceFailuresIDontKnow
...
Fixes AI being carded issue
2014-01-08 11:00:53 -08: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
46aefa1671
Merge pull request #2272 from ChuckTheSheep/OOC-color-selection
...
OOC Color Default In Input
2014-01-07 23:39:25 -08: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
7418700cce
Adds a badmin bomb that lets you var edit the explosion (for pure firebombs and stupid huge explosions [remember to toggle the bombcap first])
...
Changes how wire shuffling works to cut down on abandoned wires.
Removes a rogue processing_objects I missed before
2014-01-07 20:50:25 -05: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
e468ea24d1
I dont have one so no idea hows it spelled
...
Fuck you grammer
2014-01-07 22:01:08 +04:00
a4780069d3
Merge branch 'master' of https://github.com/tgstation/-tg-station into WhyAIsDontHaveMentalInterfaceFailuresIDontKnow
2014-01-07 21:58:16 +04:00
0665ff4125
Merge pull request #2264 from Giacom/disposal_outlet_runtimefix
...
Fixes the disposal outlet runtiming.
2014-01-07 08:42:21 -08: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
34fad5272b
Merge pull request #2262 from Razharas/NoIReallyCant
...
Fixes cloning not working properly
2014-01-07 07:44:44 -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
Cheridan
fleure
sirbayer
Giacom
ManeaterMildred
VistaPOWA
Rockdtben
dumpdavidson
YotaXP
Aranclanos
Mark Aherne (Faerdan)
ChuckTheSheep
JJRcop
Incoming
Razharas