LetterJay
739d5c70a7
Update meat.dm
2017-08-28 09:17:14 -05:00
CitadelStationBot
41b0f9f9d4
Gorillas
2017-08-20 19:56:21 -05:00
LetterJay
2181449c7d
Merge pull request #2435 from Citadel-Station-13/upstream-merge-29984
...
[MIRROR] Gives SSdisease SS_NO_INIT
2017-08-20 09:57:09 -05:00
LetterJay
994d064eba
Merge pull request #2438 from Citadel-Station-13/upstream-merge-30011
...
[MIRROR] Diseases will properly make new symptoms instead of sharing the same for everyone
2017-08-20 09:47:49 -05:00
LetterJay
c29e9c18fa
Merge pull request #2439 from Citadel-Station-13/upstream-merge-29994
...
[MIRROR] Singularities dig up asteroid turf
2017-08-20 09:47:31 -05:00
ktccd
5731ea7cad
Climaxing/masturbation changes, exposing through clothing, breastmilk and masturbation ( #2357 )
...
* Genital refactoring and masturbation rework
Refactors a lot of genitalia code.
Reworks masturbation code.
Adds the ability to expose onself through clothing (Still bugfixing it).
* Fixes it so everything works
Toggling exposing your genitals now works properly. You can now expose
genitals through clothing.
Genitalia is rendered a bit more modularly and less hardcoded.
Genitalia no longer has linked_penis and such, but instead linked_organ.
More variables made general for genitals.
Breasts can now be used to masturbate and climax, also letting you fill
beakers and others with milk.
Both being pulled and pulling someone can let you count them as a
partner for climaxing verbs.
Mob_climax split up into more sub-procs.
Hexacrocin made less verbose, and not as spam-happy with forced orgasms.
Hexacamphor also made less verbose.
* Removes outcommented code
Forgot to remove the old masturbation code that I commented out.
* Changes one tab further on line 248
As pointed out to me ^^.
* Climaxing with partner tabulation
Also copied the command for the spillage version.
* capitalisation and timers
Removed timers from forced climaxes and made it a default value
parameter instead, so it's adjustable.
Changed capitalisation of genitals and the mentions of them now use the
.name to avoid including a "The" in the mention.
* I accidentally runtimestation
Accidentally committed changing the map to runtimestation when I
debugged my code.
Changed it back to basemap now.
2017-08-19 19:01:02 -07:00
CitadelStationBot
eb0235792a
Singularities dig up asteroid turf
2017-08-19 18:41:38 -05:00
CitadelStationBot
c17ca3001f
Diseases will properly make new symptoms instead of sharing the same for everyone
2017-08-19 18:41:34 -05:00
CitadelStationBot
bc121da0af
Gives SSdisease SS_NO_INIT
2017-08-19 18:40:18 -05:00
CitadelStationBot
da6e3d7c8e
readds toggle_hear_radio admin verb
2017-08-19 06:45:50 -05:00
LetterJay
e8af537064
Merge pull request #2424 from Citadel-Station-13/upstream-merge-29968
...
[MIRROR] Makes mixing meth dangerous again
2017-08-18 22:44:08 -05:00
CitadelStationBot
f7bde6a76a
Makes mixing meth dangerous again
2017-08-18 18:59:58 -05:00
CitadelStationBot
45d6ece7a8
Adds a warning to the traitor panel for the last headrev
2017-08-18 18:57:53 -05:00
Cactus
ad8af9f9ec
fixes shark tail color
...
husky ears moved to extra instead of inner, in line with wolf ears
2017-08-18 17:27:07 -04:00
Cactus
61d7ad4e82
Stylesheet and Wolves ( #2389 )
...
* organizes the mam_bodyparts file by species
* Revert "organizes the mam_bodyparts file by species"
This reverts commit ab692973ba20c282becf0d69514b1ac03d5447f8.
* stylesheet fix
* wolf sprite edits
* conflict resolution
* wolf accessories readded
2017-08-18 15:35:08 -04:00
LetterJay
85a10be496
Merge pull request #2221 from Citadel-Station-13/upstream-merge-29523
...
[MIRROR] Makes GetComponent() faster using typecache magic
2017-08-18 14:16:44 -05:00
LetterJay
2c33ef3ab0
Update component.dm
2017-08-18 13:56:47 -05:00
LetterJay
95cbe66a3a
Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870
...
[MIRROR] Fixes a typo in the blobbernaut spawn text
2017-08-18 13:41:37 -05:00
LetterJay
6dd7c44bbc
Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829
...
[MIRROR] Merges the two turf/Entereds
2017-08-18 13:41:23 -05:00
LetterJay
19b8a5a380
Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858
...
[MIRROR] Fixed sign description
2017-08-18 13:41:07 -05:00
LetterJay
f378f66705
Merge pull request #2347 from Citadel-Station-13/upstream-merge-29794
...
[MIRROR] Removes chat pings from href logs
2017-08-18 11:27:13 -05:00
LetterJay
094c4847f7
Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849
...
[MIRROR] More baseturf helpers
2017-08-18 11:26:53 -05:00
LetterJay
8a7c0e657f
Update powers.dm
2017-08-18 11:20:36 -05:00
LetterJay
db3622ca12
Update signs.dm
2017-08-18 11:18:33 -05:00
LetterJay
3c91fba8e3
Update turf.dm
2017-08-18 11:16:30 -05:00
LetterJay
79c44b053d
Merge branch 'master' into upstream-merge-29794
2017-08-18 11:14:45 -05:00
LetterJay
146b5880d5
Merge pull request #2410 from Citadel-Station-13/upstream-merge-29934
...
[MIRROR] Fixes leathercrafting recipies trying to build on the floor.
2017-08-17 10:09:16 -05:00
LetterJay
327214c299
Merge pull request #2409 from Citadel-Station-13/upstream-merge-29945
...
[MIRROR] Improves attack logging of pulling / grabbing / throwing
2017-08-17 10:09:01 -05:00
LetterJay
848fbc4251
Merge pull request #2408 from Citadel-Station-13/upstream-merge-29948
...
[MIRROR] The station explosion cinematic now uses the old "far explosion" sound
2017-08-17 10:08:13 -05:00
LetterJay
c32595f980
Merge pull request #2399 from Citadel-Station-13/upstream-merge-29820
...
[MIRROR] Blobs can now sense loving cuddles!
2017-08-17 10:07:37 -05:00
LetterJay
e44a70c135
Merge pull request #2396 from Citadel-Station-13/upstream-merge-29797
...
[MIRROR] Moves most of world.dm
2017-08-17 10:07:06 -05:00
CitadelStationBot
72cf7083f6
Fixes leathercrafting recipies trying to build on the floor.
2017-08-17 09:19:09 -05:00
CitadelStationBot
2a2e4b2af4
Improves attack logging of pulling / grabbing / throwing
2017-08-17 09:19:05 -05:00
CitadelStationBot
0c957efee1
The station explosion cinematic now uses the old "far explosion" sound
2017-08-17 09:18:58 -05:00
CitadelStationBot
68830dac71
Changes smes, cells, cell charger, terminals and apcs icons
2017-08-16 20:02:24 -05:00
LetterJay
a2e9480cff
Update world.dm
2017-08-16 19:40:40 -05:00
LetterJay
6f1b78e12c
Merge pull request #2395 from Citadel-Station-13/upstream-merge-29937
...
[MIRROR] [s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
2017-08-16 19:35:22 -05:00
LetterJay
60f4d552da
Merge pull request #2398 from Citadel-Station-13/upstream-merge-29912
...
[MIRROR] Removes meth explosion syringes
2017-08-16 19:34:51 -05:00
CitadelStationBot
4bd5e318c2
Blobs can now sense loving cuddles!
2017-08-16 18:00:54 -05:00
CitadelStationBot
9176bbc129
Removes meth explosion syringes
2017-08-16 17:59:48 -05:00
CitadelStationBot
e5b7eefffe
Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
2017-08-16 17:53:39 -05:00
CitadelStationBot
afbe4be50c
Moves most of world.dm
2017-08-16 17:51:33 -05:00
CitadelStationBot
c2d335b7da
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
2017-08-16 17:50:28 -05:00
LetterJay
2b9f59ca3d
bonesless pizza
2017-08-16 15:06:16 -05:00
LetterJay
c627cec04a
Merge pull request #2388 from sirelgate/master
...
Xeno Fix, Nerfing them.
2017-08-16 13:51:06 -05:00
Haresay
6f20e222d3
xenofix
2017-08-16 11:55:40 -06:00
Haresay
aaaecf731c
xenonerfs
2017-08-16 11:35:36 -06:00
Haresay
e06288d41a
Xenonerfs
2017-08-16 10:31:03 -06:00
LetterJay
b9432d6619
Merge pull request #2387 from Citadel-Station-13/AlienDisable
...
Disables Roundstart Aliens
2017-08-16 09:56:38 -05:00
LetterJay
b3e984af5b
Update furrypeople.dm
2017-08-16 09:41:55 -05:00
