Commit Graph

2290 Commits

Author SHA1 Message Date
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
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
Giacom
c1d228a96e Merge pull request #2282 from Cheridan/Magic
Upgradeable Laser Pointers!
2014-01-11 06:09:19 -08:00
Giacom
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
Giacom
7b5e401ee6 Merge pull request #2275 from JJRcop/nuke-toy
Adds new nuke toy
2014-01-11 04:22:20 -08:00
Cheridan
c10d9b2611 fixing my fixes 2014-01-10 14:10:30 -06:00
Giacomand
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
Giacom
4304107d26 Merge pull request #2242 from ChuckTheSheep/Morgue-Changes
Morgue Changes
2014-01-10 08:19:33 -08:00
Aranclanos
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
Aranclanos
3d6eb6dd3d Fixed tables not working 2014-01-09 18:54:54 -03:00
ChuckTheSheep
8e050332d6 Cleans up the for() and list handling in update. 2014-01-08 18:12:17 -05:00
Cheridan
397b2f07e8 fixes 2014-01-08 10:42:12 -06:00
JJRcop
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
YotaXP
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
Cheridan
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
JJRcop
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
Cheridan
afd6b5fa22 Merge pull request #2266 from fleure/janradio
Gives janitor service headset
2014-01-07 08:37:24 -08:00
JJRcop
1300e3ebf3 Adds a visible_message to the nuke toy when it is used 2014-01-07 11:20:19 -05:00
Cheridan
1a58a3cf86 Merge pull request #2265 from fleure/watertank
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -08:00
Giacom
9602bd2c14 Merge pull request #2256 from Aranclanos/RRpls
Half of the runtimes of four days here
2014-01-07 06:24:57 -08:00
ChuckTheSheep
676dc5269a Moved Login/Logout to their defined files 2014-01-06 21:25:10 -05:00
ChuckTheSheep
9f314fcb07 Made the Login/out()s involved under mob 2014-01-06 21:20:36 -05:00
ChuckTheSheep
1d7858d54f Fixes regarding path case 2014-01-06 18:01:28 -05:00
Cheridan
58159a00ad Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
Poker tables
2014-01-06 14:35:03 -08:00
JJRcop
94ef52e1cd Adds new nuke toy, plays nuke sound when attack_self'd
Cooldown of 5 minutes
2014-01-06 16:46:12 -05:00
Giacom
a219896082 Merge pull request #2241 from ChuckTheSheep/explosiveoptimization
Explosion Optimizations
2014-01-06 13:07:05 -08:00
Fleure
c50255107a Gives janitor service headset 2014-01-06 18:51:22 +00:00
Fleure
333d0ed045 Reduced watertank slowdown slightly 2014-01-06 18:26:06 +00:00
errorage
bfcd050b77 Partial commit for the cyborg UI upgrade, which gets rid of the pop-up window for module selection, instead displaying the available modules in storage-item like fashion. 2014-01-06 12:17:07 +01:00
Aranclanos
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
ChuckTheSheep
e97ce3edfa Moved on_login() now named on_log() 2014-01-05 20:49:36 -05:00
ChuckTheSheep
072b78876f Merge branch 'Morgue-Changes' of https://github.com/ChuckTheSheep/-tg-station into Morgue-Changes 2014-01-05 20:36:10 -05:00
ChuckTheSheep
5cda0c140e Forgot Crematorium Changes - Whoops 2014-01-05 20:35:57 -05:00
Giacom
3c84e37160 Merge pull request #2235 from AndroidSFV/fix2221
Resolves #2221
2014-01-05 06:52:47 -08:00
Cheridan
bf9fa21ddc Merge pull request #2149 from Miauw62/kittens
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
Cheridan
e71314d4eb Merge pull request #2199 from Perakp/buckleFix
Buckle fix
2014-01-04 19:51:59 -08:00
ChuckTheSheep
d1eb240c33 Whoops 2014-01-04 21:22:31 -05:00
ChuckTheSheep
9bff642d14 Genocide of the Colons 2014-01-04 21:21:42 -05:00
ChuckTheSheep
b3635a2935 small fixes 2014-01-04 20:03:22 -05:00
ChuckTheSheep
f03d2be397 Morgue Changes
Crematorium lights up when cooking.
Morgue slabs change light color depending on what is inside.
Red = dead body, orange = no body but items, green = client connected
body.
Updates when open or closed, and when ghosts/re-enters body inside.
2014-01-04 19:50:13 -05:00
ChuckTheSheep
e71f98bbb8 Explosion Optimizations
Implements a trange that internally checks only turfs and thus less
intensive.
2014-01-04 19:29:17 -05:00
AndroidSFV
fe6f217d6f Adds logging to emagged borgs using their stun arm. 2014-01-04 04:00:16 -06:00
Miauw
61ed6a5e15 Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-03 19:27:51 +01:00
Giacom
537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
Removes the gag ball.
2014-01-03 04:19:29 -08:00
Giacom
09da906881 Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
Cheridan
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
Aranclanos
1e3f2c37a6 Removes the gag ball. 2014-01-01 23:43:01 -03:00
Cheridan
6c644f4652 Merge pull request #2185 from Cluwnes/itspersonnell
Those personnell were successfull.
2014-01-01 14:36:09 -08:00
Perakp
ac9228bae1 Added an else message to make it clear you can't unbuckle while buckled.
Refractored code to reduce copypasta.
2014-01-01 11:31:15 +02:00