Commit Graph

3982 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
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
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
50c4fedefe Merge pull request #2296 from Aranclanos/ProperDisposalFix
Disposal fixes
2014-01-11 04:14:16 -08: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
203264b124 Merge pull request #2268 from Giacom/last_breath
While in critical you can whisper your final breath, it will result in you immediately dying afterwards, like in the movies!
2014-01-10 05:15:54 -08:00
Giacomand
3626454719 The final whispering uses succumb, which will log their will to die.
All living mobs can now use InCritical(), humans override it.
2014-01-10 12:35:34 +00:00
Aranclanos
3993fbe9b5 Merge pull request #2288 from ManeaterMildred/WHYISRUNTIMEORANGEWHENDEADOHGOD
Fixed the highly important bug that made Runtime orange when dead.
2014-01-10 01:49:38 -08:00
Aranclanos
7eca4bd35a Merge pull request #2259 from Giacom/forensic_range
The forensic scanner can now remotely scan things, making it harder for the criminals.
2014-01-10 00:58:26 -08:00
Aranclanos
07e6bf00d6 Merge pull request #2289 from Balrog-was-here/tyopfox
Fixed typo in augmented limb weld message
2014-01-10 00:57:00 -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
ad3d3c92ac Removes the deliverychute entirely from the machinery ticker and updates his flush() proc with his parent that I fixed long time ago. Because someone though that copypasting was the best idea to make new machines.
Anyways I'm not planning to keep touching this for a while, if you want to remove the copypasta, please, do it.
If there's a wall on top of the exit of a disposal pipe, the disposal pipe will now shoot the stuff to the wall anyways because being stuck in the holder inside of pipe sucks.
2014-01-10 04:59:24 -03:00
Balrog
98f0e4447c Fixed typo in augmented limb weld message 2014-01-08 17:14:57 -05:00
ManeaterMildred
c29b3fcb52 Fixed the highly important bug that made Runtime orange when dead. 2014-01-08 20:53:08 +01:00
Giacom
3b6f111bf3 Merge pull request #2274 from Aranclanos/ChangeTurfAwYiss
Linda cries if you don't use ChangeTurf()
2014-01-08 11:00:21 -08:00
Giacomand
ddb52452a1 Final whispers will use the Elipses proc for extra tension.
The Elipses proc got a new argument which disables replacing words with ..., and instead just adds them.
2014-01-08 18:50:38 +00: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
Robson Richards
e83928a6ac Span classes 2014-01-07 21:12:16 +00:00
Razharas
7db7be3034 Merge branch 'master' of https://github.com/tgstation/-tg-station into ICantCodeForShit 2014-01-07 21:42:05 +04:00
Cheridan
b2108a98ac Merge pull request #2246 from Giacom/followme
Made the ghost follow verb less buggy.
2014-01-07 08:54:00 -08:00
Giacom
7cb6fcb5dc Merge pull request #2243 from Cheridan/Ninja
Ninja Death Tweak
2014-01-07 06:34:35 -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
Aranclanos
42e13b8914 Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell. 2014-01-07 09:19:59 -03:00
ChuckTheSheep
5eb6491c0c Whoops 2014-01-06 21:27:50 -05:00
ChuckTheSheep
676dc5269a Moved Login/Logout to their defined files 2014-01-06 21:25:10 -05:00
Giacomand
7551dd38a8 Changed "his" to "their" 2014-01-06 23:24:47 +00:00
Giacomand
8c1a8f072c Added a check for being unconscious and not in critical. 2014-01-06 21:52:41 +00:00
Cheridan
9bff546dad Merge pull request #2245 from Nienhaus/master
Side Part hair
2014-01-06 13:48:35 -08:00
Giacomand
a0eac7b352 While in critical you can whisper your final breath, it will result in you immediately dying afterwards, like in the movies!
How much you can say is dependent on how far away you are from death, the closer the less you can say.
2014-01-06 21:41:14 +00:00
Razharas
83c9481bfc Fixes R&D working improperly
Yeah thats it
2014-01-06 21:34:10 +04:00
Giacomand
f648b74e51 Fixes a missing \the 2014-01-06 17:16:24 +00:00
Giacomand
618e998574 * Forensic scanner can now remotely scan things, making it easier for the detective. 2014-01-06 17:12:35 +00:00
errorage
4d7e53c083 - Clicking on an item in your modules list now instantly moves it, the delay between click and it moving to the active module slot, which is seen in the video, is no longer there. 2014-01-06 16:43:25 +01: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
Cheridan
26d3d03d69 Merge pull request #1906 from Aranclanos/GiaPlsFix
Removed the need of input and output objects for the mining machinery
2014-01-05 14:23:28 -08:00
Giacomand
16b35bf32f Made the follow verb less buggy.
Removed duplicated code.
2014-01-05 17:44:46 +00:00
Nienhaus
9e798d1890 Side Part hair
Someone requested side parted hair so I did it.
Image: http://puu.sh/6apZJ.png
2014-01-05 08:34:24 -06:00
Cheridan
261615a0bc Ninja Death Tweak
THE CODE NO LONGER CHECKS IF THE MOB IS A NINJA EVERY TIME SOMEONE DIES

NINJAS GET EXPLOSIVE IMPLANTS TO DUPLICATE THE OLD FUNCTIONALITY

YES I'M MAD
2014-01-04 19:26:05 -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
Razharas
80b592d0b3 Resolving conflicts
God hates git
And so do i
2014-01-03 21:12:14 +04:00
Giacom
537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
Removes the gag ball.
2014-01-03 04:19:29 -08:00
Aranclanos
b5fc39236f changes strings to paths on the mining machinery code 2014-01-03 03:23:28 -03:00
Giacom
b2e53335f0 Merge pull request #2167 from rymd/text-fix
Fixed destructive analyzer failure messages
2014-01-02 10:32:32 -08:00
Giacom
70a4d8e9af Merge pull request #2192 from Cheridan/iDidThisByHand
Obsoletes flags = FPRINT | TABLEPASS*
2014-01-02 10:31:46 -08:00
Giacom
c56cc9c89f Merge pull request #2122 from Miauw62/disposalsfix
Disposals will no longer create invisible floor tiles.
2014-01-02 10:30:12 -08:00
Cheridan
68362d7b49 fixing conflicts
THANKS GIA

:I
2014-01-02 10:04:22 -06: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
Giacom
542aca21f8 Merge pull request #2186 from Cluwnes/theunknownchicken
Gives the chicken suit head some inv_flags
2014-01-02 07:20:27 -08:00