Commit Graph

161 Commits

Author SHA1 Message Date
kevinz000 0925cb108b wew 2017-08-29 22:09:42 -07:00
LetterJay 6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
ktccd cdfa4148b4 Makes genitals_use_skintone save (#2514)
Adds a hook or whatever for it to save the setting.
Now, granted, with my previous PR this is probably pointless since
humans got custom colours now...
But it's good practice, you know? In case we revert the other PR and
all.
2017-08-27 04:22:04 -07:00
ktccd 597c048975 This was bothering me (#2449)
Now it's fixed.
2017-08-21 17:03:41 -07:00
LetterJay 79c44b053d Merge branch 'master' into upstream-merge-29794 2017-08-18 11:14:45 -05:00
LetterJay 0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay d133510288 Update preferences_savefile.dm 2017-08-15 19:06:41 -05:00
LetterJay ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
LetterJay fdfb61b527 Update client_procs.dm 2017-08-13 09:50:51 -05:00
CitadelStationBot 501972a2f8 Removes chat pings from href logs 2017-08-13 01:26:46 -05:00
ktccd 4188db53a5 Flavortext transition finished
Now properly moves OLD flavortext to the new format and then removes the
old format.
If no old format is found, it defaults to loading the new format.
Flavortext is now stored in your DNA, and is loaded into your characters
flavor_text variable upon creating the character or messing with the
DNA.
This allows cloners/pods/changelings to use the correct flavortext.
2017-08-11 23:48:46 +02:00
ktccd 1b2f2120ec DO NOT MERGE - Fixes random resetting of file
I did a bad with the direction of >> and <<. My bad.
Fixed now, I will test FURTHER to confirm that old files are not deleted
or ruined.
2017-08-11 23:10:05 +02:00
ktccd d7ac827ea6 Testing Transition code, DO NOT MERGE YET!!
As it says, do not merge until I confirm that it works.
2017-08-11 21:59:35 +02:00
ktccd 62a7d4301f Refactored flavortext.
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
2017-08-11 20:13:01 +02:00
CitadelStationBot cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
LetterJay 814a814299 Merge pull request #2288 from Citadel-Station-13/upstream-merge-29739
[MIRROR] Guests can now speak in ooc, reorder the ooc verb handling
2017-08-07 07:24:41 -05:00
CitadelStationBot b10172104e Guests can now speak in ooc, reorder the ooc verb handling 2017-08-06 18:02:36 -05:00
ktccd 4fdd3215d6 Fixes no-genitalia
Genitals now updates with any changes.
All the other changes in the code you see in the commit, I didn't touch.
Nothing changed, git just thinks I replaced some lines with themselves
for some godawful reason.....
2017-08-06 11:12:13 +02:00
CitadelStationBot d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039)
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
2017-08-03 06:12:27 -07:00
CitadelStationBot 3db9c9ddb7 Adds 3D Sound System 2017-07-28 09:02:21 -05:00
CitadelStationBot d7e66b7a3a You can now control-click action buttons to lock them in place 2017-07-24 17:05:41 -05:00
CitadelStationBot 956f10f2d2 [s]Fixes panic bunker 2017-07-17 07:13:45 -05:00
ktccd 6d3123f63c Readds borers (#1999)
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
CitadelStationBot f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
TalkingCactus 44206f3bf7 Update suicide.dm
just close the game
2017-07-07 18:50:13 -04:00
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
LetterJay ec966f6814 Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750
[MIRROR] Makes goonchat robust.
2017-06-26 06:26:11 -05:00
LetterJay 49e1c3f2b6 Merge pull request #1689 from Citadel-Station-13/upstream-merge-28591
[MIRROR] Changes tooltip verbs to be on preferences tab
2017-06-26 06:15:45 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot 0178323fe1 Makes goonchat robust. 2017-06-26 00:03:57 -05:00
CitadelStationBot 9ee0d6aa6d Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-22 19:50:15 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay 8ae2ceda05 Merge pull request #1713 from Citadel-Station-13/panicbunkerhotfix
Hotfix for panic bunker
2017-06-20 20:29:18 -05:00
LetterJay b1df8322b2 remove double set 2017-06-20 20:08:59 -05:00
CitadelStationBot f3ef09736e Changes tooltip verbs to be on preferences tab 2017-06-20 08:21:54 -05:00
LetterJay cd590e7fb1 Merge pull request #1686 from Citadel-Station-13/LOOCFix
fixes LOOC
2017-06-20 02:01:32 -05:00
LetterJay b28677414e Update looc.dm 2017-06-20 01:47:52 -05:00
LetterJay a8b498a2a9 Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407
[MIRROR] [READY]Adds examine tooltips
2017-06-20 01:29:44 -05:00
LetterJay 4775f0b9c5 Update looc.dm 2017-06-20 01:27:05 -05:00
LetterJay 9f40c381a4 fixes looc 2017-06-20 01:25:48 -05:00
LetterJay f97540247f Merge pull request #1667 from Citadel-Station-13/upstream-merge-28580
[MIRROR] Fix cid reconnect message not showing
2017-06-19 21:02:56 -05:00
LetterJay cd06b77e01 Delete preferences_savefile.dm.rej 2017-06-19 20:54:04 -05:00
LetterJay 13078c1130 Update preferences_savefile.dm 2017-06-19 20:52:25 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay 8120278819 update client_procs 2017-06-19 13:12:51 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot 254badde48 Fix cid reconnect message not showing 2017-06-18 22:17:57 -05:00
CitadelStationBot 9863f88366 [READY]Adds examine tooltips 2017-06-18 21:58:37 -05:00