shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,109 Commits 5 Branches 0 Tags
b89bc3c4f49963e7f38b8b37db7306e4ef2db1e9
Commit Graph

2944 Commits

Author SHA1 Message Date
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
9e0b151240 Merge pull request #2303 from Citadel-Station-13/upstream-merge-29768 
[MIRROR] Standardized CENTCOM spelling
 2017-08-09 02:20:26 -05:00
LetterJay
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
LetterJay
f9bf13a5d9 Merge pull request #2301 from Citadel-Station-13/bears 
adds bear ears and bear tail
 2017-08-09 02:19:56 -05:00
LetterJay
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
LetterJay
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
ktccd
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
CitadelStationBot
fcd1a2dc86 Oocky in icky descriptions 2017-08-08 09:05:58 -05:00
CitadelStationBot
fb86e03544 Belligerent now has a visible indicator 2017-08-08 09:05:54 -05:00
CitadelStationBot
68bbda4b4d Mechs can no longer open cult doors if the person inside is not a cultist 2017-08-08 09:05:50 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
b11bfa2d94 fixes some initialize errors 2017-08-08 09:05:39 -05:00
LetterJay
7b4cbf7784 adds bear ears and bear tail 2017-08-08 07:19:30 -05:00
CitadelStationBot
c2419e84f5 Adds a Test Areas (Station Z) verb 2017-08-08 05:50:22 -05:00
CitadelStationBot
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
ktccd
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
LetterJay
41f42aabca Merge pull request #2292 from Citadel-Station-13/upstream-merge-29724 
[MIRROR] More Initialize() garbage
 2017-08-07 07:26:53 -05:00
LetterJay
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
LetterJay
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
0f77c62fc5 Merge pull request #2289 from Citadel-Station-13/upstream-merge-29740 
[MIRROR] Fixes Explosive Lattice blobs being way more fragile than they should be
 2017-08-07 07:25:53 -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
LetterJay
ecb68a4ccc Merge pull request #2287 from Citadel-Station-13/upstream-merge-29734 
[MIRROR] Fixes certain things clearing weather overlays
 2017-08-07 07:24:05 -05:00
LetterJay
b25c5d5acc Merge pull request #2283 from Citadel-Station-13/upstream-merge-29732 
[MIRROR] Freon now simply uses a color matrix rather than blending an icon
 2017-08-07 07:22:47 -05:00
LetterJay
a66bbc69fd Merge pull request #2281 from ktccd/Char-viewer-fix 
Fixes no-genitalia
 2017-08-07 07:22:12 -05:00
LetterJay
ee772f52d6 Merge pull request #2273 from Citadel-Station-13/upstream-merge-29697 
[MIRROR] Rewrites incorrect documentation for the pickweight() proc
 2017-08-07 07:20:26 -05:00
LetterJay
a93b0724dc Merge pull request #2272 from Citadel-Station-13/upstream-merge-29648 
[MIRROR] Enables goonchat restart notification
 2017-08-07 07:19:45 -05:00
LetterJay
8c51b5648c Merge pull request #2271 from Citadel-Station-13/upstream-merge-29699 
[MIRROR] Improves Tesla Performance
 2017-08-07 07:19:28 -05:00
LetterJay
b449843a1e Merge pull request #2270 from Citadel-Station-13/upstream-merge-29711 
[MIRROR] Fixes oversight with APCs using areastring
 2017-08-07 07:18:35 -05:00
LetterJay
0dcd93ad73 Merge pull request #2268 from Citadel-Station-13/upstream-merge-29706 
[MIRROR] Fixes showers breaking lighting objects.
 2017-08-07 07:18:17 -05:00
LetterJay
d6ef9454ed Merge pull request #2266 from Citadel-Station-13/upstream-merge-29703 
[MIRROR] Fixes stuff on shuttles not rotating in the proper direction
 2017-08-07 07:17:54 -05:00
LetterJay
c5c25639ee Merge pull request #2267 from Citadel-Station-13/upstream-merge-29654 
[MIRROR] Fixes vendors not returning an Initialize hint
 2017-08-07 07:17:39 -05:00
LetterJay
6c122ea563 Merge pull request #2269 from Citadel-Station-13/upstream-merge-29691 
[MIRROR] Replaces blob's send intercept sleep() with addtimer
 2017-08-07 07:17:24 -05:00
CitadelStationBot
1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
CitadelStationBot
d071a78888 Sounds played with sound_to_playing_players are less tinny 2017-08-06 18:02:47 -05:00
CitadelStationBot
e80f1dba99 Fixes being able to "stomp out" sigils with telekinesis 2017-08-06 18:02:43 -05:00
CitadelStationBot
7e539bfe3b Fixes Explosive Lattice blobs being way more fragile than they should be 2017-08-06 18:02:40 -05:00
CitadelStationBot
b10172104e Guests can now speak in ooc, reorder the ooc verb handling 2017-08-06 18:02:36 -05:00
CitadelStationBot
5d80d2df4b Fixes certain things clearing weather overlays 2017-08-06 18:02:33 -05:00
CitadelStationBot
5242663885 Freon now simply uses a color matrix rather than blending an icon 2017-08-06 12:42:08 -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
e95ddfaf94 Rewrites incorrect documentation for the pickweight() proc 2017-08-06 03:09:47 -05:00
CitadelStationBot
633952d302 Enables goonchat restart notification 2017-08-06 03:08:42 -05:00
CitadelStationBot
0eea5ad53d Improves Tesla Performance 2017-08-06 03:07:38 -05:00
CitadelStationBot
a90448b262 Fixes oversight with APCs using areastring 2017-08-05 19:28:33 -05:00
CitadelStationBot
5fd31559ea [MIRROR] Fixed typo for cyberimp_surgical's ID (#2229) 
* Fixed typo for cyberimp_surgical's ID

* Delete medical_designs.dm.rej

* Update medical_designs.dm
 2017-08-05 10:29:02 -07:00
CitadelStationBot
fd59456a73 [MIRROR] Adds Surgical toolarms to R&D, makes them less robust (#2197) 
* Adds Surgical toolarms to R&D, makes them less robust

* Delete medical_designs.dm

* Delete augments_arms.dm

* Delete tools.dm
 2017-08-05 10:27:12 -07:00
CitadelStationBot
90a7ead961 [MIRROR] The AI's internal camera functions better (#2219) 
* The AI's internal camera functions better

* sync robot.dm and hopefully not break shit
 2017-08-05 10:24:58 -07:00