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
5a7126a0dd
Panic Bunker for moderator/trialmin access
2017-08-12 01:15:42 -05: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
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
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
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
805aa06807
adds bear tails/ears to humans as well
2017-08-09 11:23:09 -05:00
83c546f143
Fixes swarmer shells having no ghost notifications
2017-08-09 03:26:14 -05:00
943599c5f1
Clock powerdrain now works on any device with a powercell
2017-08-09 03:05:47 -05:00
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
05cbf7927a
Merge pull request #2311 from Citadel-Station-13/upstream-merge-29775
...
[MIRROR] Fixes repairing jumpsuits.
2017-08-09 02:22:17 -05:00
26ca12fb04
Merge pull request #2310 from Citadel-Station-13/upstream-merge-29773
...
[MIRROR] Fix RCL loading
2017-08-09 02:22:09 -05:00
9a7d9e6413
Merge pull request #2309 from ktccd/Arousal-clone-fix
...
Makes mindtransfers respect arousal
2017-08-09 02:22:02 -05:00
b89bc3c4f4
Merge pull request #2308 from ktccd/Masturbation-Stuff
...
Male masturbation fix, forced orgasm, ejaculation in partner and aphro+/anaphro+ changes.
2017-08-09 02:21:48 -05:00
7b371b02e3
Merge pull request #2306 from Citadel-Station-13/upstream-merge-29756
...
[MIRROR] Oocky in icky descriptions
2017-08-09 02:21:38 -05:00
f68287e31e
Merge pull request #2305 from Citadel-Station-13/upstream-merge-29766
...
[MIRROR] Belligerent now has a visible indicator
2017-08-09 02:20:51 -05:00
94386375a8
Merge pull request #2304 from Citadel-Station-13/upstream-merge-29767
...
[MIRROR] Mechs can no longer open cult doors if the person inside is not a cultist
2017-08-09 02:20:42 -05:00
9e0b151240
Merge pull request #2303 from Citadel-Station-13/upstream-merge-29768
...
[MIRROR] Standardized CENTCOM spelling
2017-08-09 02:20:26 -05:00
470b19b1c1
Merge pull request #2302 from Citadel-Station-13/upstream-merge-29769
...
[MIRROR] fixes some initialize errors
2017-08-09 02:20:14 -05:00
f9bf13a5d9
Merge pull request #2301 from Citadel-Station-13/bears
...
adds bear ears and bear tail
2017-08-09 02:19:56 -05:00
a43304a1e5
Merge pull request #2300 from Citadel-Station-13/upstream-merge-29748
...
[MIRROR] Adds a Test Areas (Station Z) verb
2017-08-09 02:19:47 -05:00
5651bb3497
Merge pull request #2299 from Citadel-Station-13/upstream-merge-29712
...
[MIRROR] Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one.
2017-08-09 02:19:36 -05:00
2004d399c9
Makes dummy humans queue instead of harddel
2017-08-08 22:26:10 -05:00
0a7a8fcf90
Fixes repairing jumpsuits.
2017-08-08 15:04:21 -05:00
5eadc197cf
Fix RCL loading
2017-08-08 14:59:10 -05:00
c0cc428216
Makes mindtransfers respect arousal
...
Clients arousal preferences are now taken into account when transferring
minds.
2017-08-08 19:45:06 +02:00
9e71a0bdb1
Lots of genital changes
...
Penile masturbation is fixed again.
Masturbation cooldown set to 5 seconds once again, as intended.
mob_masturbate is now mob_climax(forced_climax=FALSE). It can be used to
masturbate alone, cum inside someone partially or completely and can be
used to trigger a forced orgasm through all eligible genitals.
Hexacrocin (Aphro PLUS) now increases your minimum arousal over time
when overdosing, up to your maximum arousal level at which point you are
constantly aroused.
When fully aroused, hexacrocin overdose will force an orgasm.
Hexacamhor (ANaphro PLUS) overdose now decreases minimum arousal over
time, down to 0.
Added to_chat feedback to the player when their libido changes
permanently.
Changed old "src <<" messages to use the new to_chat in citadel chems
and citadel arousal, so text should display now.
Changed names of genitals to be capitalized, to avoid the code
automatically calling them "The X".
Masturbation also has more helpful feedback messages when you lack the
correct organs.
The old force_orgasm proc is removed, use mob_climax(forced_climax=TRUE)
instead.
2017-08-08 17:41:27 +02:00
fcd1a2dc86
Oocky in icky descriptions
2017-08-08 09:05:58 -05:00
fb86e03544
Belligerent now has a visible indicator
2017-08-08 09:05:54 -05:00
68bbda4b4d
Mechs can no longer open cult doors if the person inside is not a cultist
2017-08-08 09:05:50 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
b11bfa2d94
fixes some initialize errors
2017-08-08 09:05:39 -05:00
7b4cbf7784
adds bear ears and bear tail
2017-08-08 07:19:30 -05:00
c2419e84f5
Adds a Test Areas (Station Z) verb
2017-08-08 05:50:22 -05:00
d3b5f0aa6d
Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one.
2017-08-08 05:49:17 -05:00
dad39bb1a4
Fixes displaying digestion alert for preys
...
visible_message doesn't actually send anything to a dead mob, probably
because they can't hear.
Moved that it's own message piece instead. [0.5h testing memes]
2017-08-08 10:22:04 +02:00
40a8449f11
GM completion check and mulligan now check to see if players are logged out
2017-08-07 12:26:20 -05:00
fbabd14798
Fixes adminhelp sending the wrong message to players
2017-08-07 12:26:15 -05:00
41f42aabca
Merge pull request #2292 from Citadel-Station-13/upstream-merge-29724
...
[MIRROR] More Initialize() garbage
2017-08-07 07:26:53 -05:00
8386d5e610
Merge pull request #2290 from Citadel-Station-13/upstream-merge-29735
...
[MIRROR] Fixes being able to "stomp out" sigils with telekinesis
2017-08-07 07:26:30 -05:00
fc450fd561
Merge pull request #2291 from Citadel-Station-13/upstream-merge-29725
...
[MIRROR] Sounds played with sound_to_playing_players are less tinny
2017-08-07 07:26:18 -05:00
LetterJay