Commit Graph
4166 Commits
Author SHA1 Message Date
CitadelStationBot 3f562c113c get_head_slots() now returns wear_neck 2017-08-13 01:27:54 -05:00
LetterJayandGitHub f615bc0dff Merge pull request #2342 from Citadel-Station-13/bear-fix
Bear ears/tails fix
2017-08-12 07:05:38 -05:00
CitadelStationBot 53b1377402 Automatic changelog generation for PR #2339 [ci skip] 2017-08-12 06:36:59 -05:00
LetterJayandGitHub a9a7807473 Merge pull request #2339 from Citadel-Station-13/upstream-merge-29819
[MIRROR] His Grace now shows up on the orbit list
2017-08-12 06:36:57 -05:00
LetterJayandGitHub 040c250270 Merge pull request #2341 from Citadel-Station-13/upstream-merge-29865
[MIRROR] Fix travis
2017-08-12 06:36:43 -05:00
LetterJayandGitHub dd6c9d6a04 Merge pull request #2334 from Citadel-Station-13/upstream-merge-29811
[MIRROR] Fixes cable cuff inhand
2017-08-12 06:36:15 -05:00
LetterJayandGitHub ad938dede1 Merge pull request #2336 from Citadel-Station-13/upstream-merge-29845
[MIRROR] gorilla sprites
2017-08-12 06:35:56 -05:00
CitadelStationBot 4298f6539d Automatic changelog generation for PR #2335 [ci skip] 2017-08-12 06:35:46 -05:00
LetterJayandGitHub c00f0a99f0 Merge pull request #2335 from ktccd/Flavor-elevator
Refactored flavortext to be savable in DNA. (RIP old changeling-meta-hunting)
2017-08-12 06:35:45 -05:00
LetterJayandGitHub 122727059b Merge pull request #2333 from Citadel-Station-13/upstream-merge-29804
[MIRROR] Ports weaponry to Initialize
2017-08-12 06:35:25 -05:00
LetterJayandGitHub c174eb3f5d Merge pull request #2331 from Citadel-Station-13/upstream-merge-29803
[MIRROR] Ports weapons to Initialize()
2017-08-12 06:35:09 -05:00
LetterJayandGitHub 8ca2a8d3bd Merge pull request #2330 from Citadel-Station-13/upstream-merge-29799
[MIRROR] Fixes help text for embedded objects
2017-08-12 06:34:56 -05:00
LetterJayandGitHub 1520c4facd Merge pull request #2327 from Citadel-Station-13/upstream-merge-29800
[MIRROR] Massively improves downloading/viewing logs.
2017-08-12 06:34:41 -05:00
LetterJayandGitHub 6b6e5d0018 Merge pull request #2326 from Citadel-Station-13/upstream-merge-29805
[MIRROR] decapitalizes flyswatter in weaponry.dm
2017-08-12 06:34:28 -05:00
CitadelStationBot 74636ffeb0 Automatic changelog generation for PR #2295 [ci skip] 2017-08-12 06:33:46 -05:00
LetterJayandGitHub e783997250 Merge pull request #2295 from Citadel-Station-13/upstream-merge-29742
[MIRROR] GM completion check and mulligan now check to see if players are logged out
2017-08-12 06:33:44 -05:00
LetterJayandGitHub 962d983079 Merge pull request #2294 from Citadel-Station-13/upstream-merge-29746
[MIRROR] Fixes adminhelp sending the wrong message to players
2017-08-12 06:33:29 -05:00
LetterJay 73426d56ea file path fix 2017-08-12 06:31:50 -05:00
CitadelStationBot 7addb0207b Fix travis 2017-08-12 04:42:44 -05:00
PoojawaandGitHub 5a7126a0dd Panic Bunker for moderator/trialmin access 2017-08-12 01:15:42 -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
CitadelStationBot 582a106d8e His Grace now shows up on the orbit list 2017-08-11 15:09:24 -05: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
CitadelStationBot 12d4c7ade0 gorilla sprites 2017-08-11 14:52:55 -05:00
CitadelStationBotandkevinz000 84076d7bb9 intialize() supermatter sword (#2332) 2017-08-11 12:29:51 -07:00
CitadelStationBot 2102e0526a Automatic changelog generation for PR #2329 [ci skip] 2017-08-11 14:29:03 -05:00
ktccdandkevinz000 9ef1825ee0 Adds Taur cocks (#2329)
* Added flared taur penises

FIRST STEP ONLY DO NOT PULL REQUEST THIS!!!!
The files are still messy and the penis is just another shape to choose
from right now for testing purposes!
Flipped the order of GENITALS_BEHIND_LAYER and BODY_BEHIND_LAYER, as
taurs need to be drawn on top of the genitalia, and I don't think
anything else uses this that would need genitals drawn on top of them.

* Adds More shapes

Adds Tapered and Knotted shapes to the Taur cocks.

* Fixes on-ground sprites

The OLD bug barbed knotted cocks being invisible when not inside a body
is fixed.
This fix solves why taur cocks were invisible when cut off or gibbed the
body.
This also removes the lowershape() workaround that was being used.
I'll get around a bigger refactor of other genitalia in another PR, as
the scope of this was just to add taur cocks to begin with...
2017-08-11 12:29:01 -07: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 6c6d8e5193 Fixes cable cuff inhand 2017-08-11 02:52:25 -05:00
CitadelStationBot dab46b002c Ports weaponry to Initialize 2017-08-11 02:50:20 -05:00
CitadelStationBot fa19568a06 Ports weapons to Initialize() 2017-08-11 02:49:11 -05:00
CitadelStationBot 4686340d3c Fixes help text for embedded objects 2017-08-11 02:47:05 -05:00
CitadelStationBot bd8289b29f Massively improves downloading/viewing logs. 2017-08-10 10:49:22 -05:00
CitadelStationBot f6da0f89c3 decapitalizes flyswatter in weaponry.dm 2017-08-10 08:09:25 -05:00
CitadelStationBot cad81a26e2 Automatic changelog generation for PR #2320 [ci skip] 2017-08-10 06:13:49 -05:00
LetterJayandGitHub da03284a6f Merge pull request #2320 from Citadel-Station-13/bear-humn
adds bear tails/ears to humans as well
2017-08-10 06:13:47 -05:00
CitadelStationBot 014487c808 Automatic changelog generation for PR #2319 [ci skip] 2017-08-09 11:25:04 -05:00
LetterJayandGitHub 43c774b72e Merge pull request #2319 from Citadel-Station-13/upstream-merge-29781
[MIRROR] Fixes swarmer shells having no ghost notifications
2017-08-09 11:25:02 -05:00
LetterJayandGitHub c73115b82c Merge pull request #2318 from Citadel-Station-13/upstream-merge-29752
[MIRROR] Makes [WIP] and [DNM] case insensitive for autotagging
2017-08-09 11:24:43 -05:00
LetterJayandGitHub f8565150a9 Merge pull request #2317 from Citadel-Station-13/upstream-merge-29632
[MIRROR] Clock powerdrain now works on any device with a powercell
2017-08-09 11:24:30 -05:00
LetterJay 805aa06807 adds bear tails/ears to humans as well 2017-08-09 11:23:09 -05:00
CitadelStationBot 83c546f143 Fixes swarmer shells having no ghost notifications 2017-08-09 03:26:14 -05:00
CitadelStationBot 0b516b5759 Makes [WIP] and [DNM] case insensitive for autotagging 2017-08-09 03:24:08 -05:00
CitadelStationBot 943599c5f1 Clock powerdrain now works on any device with a powercell 2017-08-09 03:05:47 -05:00
LetterJayandGitHub dc502b99a6 Merge pull request #2314 from Citadel-Station-13/upstream-merge-29753
[MIRROR] Makes dummy humans queue instead of harddel
2017-08-09 02:22:33 -05:00
LetterJayandGitHub 05cbf7927a Merge pull request #2311 from Citadel-Station-13/upstream-merge-29775
[MIRROR] Fixes repairing jumpsuits.
2017-08-09 02:22:17 -05:00
LetterJayandGitHub 26ca12fb04 Merge pull request #2310 from Citadel-Station-13/upstream-merge-29773
[MIRROR] Fix RCL loading
2017-08-09 02:22:09 -05:00
CitadelStationBot fdaea528d0 Automatic changelog generation for PR #2309 [ci skip] 2017-08-09 02:22:04 -05:00
LetterJayandGitHub 9a7d9e6413 Merge pull request #2309 from ktccd/Arousal-clone-fix
Makes mindtransfers respect arousal
2017-08-09 02:22:02 -05:00