f1872a8bae
Merge pull request #2231 from Citadel-Station-13/upstream-merge-29615
...
[MIRROR] Action buttons for spells now include their description
2017-08-14 08:56:19 -05:00
281ed6cb79
Merge pull request #2146 from Citadel-Station-13/upstream-merge-29464
...
[MIRROR] Adds info about schema versioning to head of db changelog file
2017-08-14 08:31:46 -05:00
cb861b28ca
Merge pull request #2367 from Citadel-Station-13/upstream-merge-29841
...
[MIRROR] Makes the ahelp topic give the permissions warning
2017-08-14 08:21:38 -05:00
123454c45a
Merge pull request #2366 from Citadel-Station-13/upstream-merge-29846
...
[MIRROR] Makes mulligan antag check for gamemode required players
2017-08-14 08:21:24 -05:00
7c6f9c4973
Merge pull request #2363 from Citadel-Station-13/upstream-merge-29867
...
[MIRROR] Tweaks atmos canister lights.
2017-08-14 08:20:57 -05:00
76da67e316
Merge pull request #2360 from Citadel-Station-13/upstream-merge-29828
...
[MIRROR] Fixes turf slipping
2017-08-14 08:20:27 -05:00
2476d59be6
Makes the ahelp topic give the permissions warning
2017-08-14 06:54:44 -05:00
e986657b16
Makes mulligan antag check for gamemode required players
2017-08-14 06:25:03 -05:00
726ffe1fdd
Tweaks atmos canister lights.
2017-08-14 01:25:02 -05:00
e354c9f289
Fixes turf slipping
2017-08-13 18:00:36 -05:00
0e7b9a008e
Ports a slightly edited version of Eris APC sprites
2017-08-13 17:54:27 -05:00
64da23febb
Merge pull request #2356 from Citadel-Station-13/upstream-merge-29840
...
[MIRROR] Adds icon_states to the unused and used Eldritch whetstones
2017-08-13 09:53:11 -05:00
3876ecab9e
Merge pull request #2354 from Citadel-Station-13/upstream-merge-29853
...
[MIRROR] critical priority roleplay grammatical patch (*surrender emote fix)
2017-08-13 09:52:46 -05:00
248d151b90
Merge pull request #2351 from Citadel-Station-13/upstream-merge-29861
...
[MIRROR] Fix fireaxe cabinets spawned with broken icons
2017-08-13 09:52:14 -05:00
d3e8815788
Merge pull request #2350 from Citadel-Station-13/upstream-merge-29864
...
[MIRROR] Fixes minebots missing action icons
2017-08-13 09:51:45 -05:00
81dc5d2c09
Merge pull request #2349 from Citadel-Station-13/upstream-merge-29826
...
[MIRROR] get_head_slots() now returns wear_neck
2017-08-13 09:51:29 -05:00
47eb2e528f
Merge pull request #2348 from Citadel-Station-13/upstream-merge-29843
...
[MIRROR] Adds callback select system
2017-08-13 09:51:17 -05:00
1e3ea07d8b
Adds icon_states to the unused and used Eldritch whetstones
2017-08-13 01:28:24 -05:00
dae3e121f2
critical priority roleplay grammatical patch (*surrender emote fix)
2017-08-13 01:28:16 -05:00
80f1fb8c58
Fix fireaxe cabinets spawned with broken icons
2017-08-13 01:28:03 -05:00
714fc5ed4a
Fixes minebots missing action icons
2017-08-13 01:27:58 -05:00
3f562c113c
get_head_slots() now returns wear_neck
2017-08-13 01:27:54 -05:00
e972a90ba9
Adds callback select system
2017-08-13 01:27:51 -05:00
6cb9a0088f
Fixes admin mass deleting... not actually mass deleting...
2017-08-13 01:26:39 -05:00
f615bc0dff
Merge pull request #2342 from Citadel-Station-13/bear-fix
...
Bear ears/tails fix
2017-08-12 07:05:38 -05:00
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
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
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
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
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
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
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
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
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
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
73426d56ea
file path fix
2017-08-12 06:31:50 -05:00
5a7126a0dd
Panic Bunker for moderator/trialmin access
2017-08-12 01:15:42 -05:00
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
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
582a106d8e
His Grace now shows up on the orbit list
2017-08-11 15:09:24 -05:00
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
84076d7bb9
intialize() supermatter sword ( #2332 )
2017-08-11 12:29:51 -07:00
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
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
6c6d8e5193
Fixes cable cuff inhand
2017-08-11 02:52:25 -05:00
dab46b002c
Ports weaponry to Initialize
2017-08-11 02:50:20 -05:00
fa19568a06
Ports weapons to Initialize()
2017-08-11 02:49:11 -05:00
4686340d3c
Fixes help text for embedded objects
2017-08-11 02:47:05 -05:00
bd8289b29f
Massively improves downloading/viewing logs.
2017-08-10 10:49:22 -05:00
f6da0f89c3
decapitalizes flyswatter in weaponry.dm
2017-08-10 08:09:25 -05:00
LetterJay