Commit Graph

3163 Commits

Author SHA1 Message Date
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381)
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
2017-08-21 20:29:37 -07:00
kevinz000
61e6f2815b Update stomach.dm (#2453) 2017-08-21 20:27:21 -07:00
CitadelStationBot
e6650e6f35 Refined Test Areas (Station Z) debug output (#2321) 2017-08-21 20:25:20 -07:00
CitadelStationBot
b72d304f1c [MIRROR] Fixes the amounts for examining disgusted people (#2253)
* Fixes the amounts for examining disgusted people

* Update examine.dm

* Delete examine.dm.rej
2017-08-21 20:24:29 -07:00
CitadelStationBot
4961966552 |SPECIES FOOD PREFERENCES| (#2232)
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
2017-08-21 20:23:30 -07:00
kevinz000
7a5497bb40 FUCK (#2452)
FUCK - Fixes Vending Machines
2017-08-21 20:12:22 -07:00
CitadelStationBot
999c921f63 Removes the chat message from *spin (#2428) 2017-08-21 19:54:24 -07:00
LetterJay
dfd5c7465b Merge pull request #2246 from Citadel-Station-13/upstream-merge-29647
[MIRROR] Fixes SendSignal()
2017-08-21 21:50:39 -05:00
LetterJay
f2f1474123 Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
2017-08-21 20:32:10 -05:00
LetterJay
83f4733027 Rename _circuitboard.dm to circuitboard.dm 2017-08-21 20:01:59 -05:00
LetterJay
9b049e6f49 Rename machinery.dm to _machinery.dm 2017-08-21 19:42:43 -05:00
Poojawa
91fc414b20 Changes Ghost role ping sound effects (#2441)
* change that fucking blare

* Update xenobiology.dm
2017-08-21 17:05:09 -07:00
ktccd
597c048975 This was bothering me (#2449)
Now it's fixed.
2017-08-21 17:03:41 -07:00
ktccd
987c0c35da Makes Taurs not render human legs (#2448)
Since taurs use their own sprite legs instead, we'll rely on those.
This'll fix some fringe cases with nagas and the problem with driders
completely covering their front drider legs.
This will introduce some weirdness with cutting off limbs, since taur
sprites have NO support for this, but I would need to completely
refactor how we handle taurs to split up their sprites like that... And
I'm not THAT good.
2017-08-21 17:03:29 -07:00
LetterJay
259edee5a2 Update component.dm 2017-08-21 18:49:14 -05:00
LetterJay
17c0c4ba79 FUCK 2017-08-21 18:39:30 -05:00
LetterJay
39a69c2a28 Update component.dm 2017-08-21 16:50:29 -05:00
LetterJay
ab26b486b7 Update component.dm 2017-08-21 02:38:51 -05:00
CitadelStationBot
772299445e Makes the Ark of the Clockwork Justicar much more fancy 2017-08-20 19:55:15 -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
ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJay
940f5da5fd Rename _machinery.dm to machinery.dm 2017-08-20 09:52:28 -05:00
LetterJay
08bbe72923 Update portable_turret.dm 2017-08-20 09:50:56 -05:00
LetterJay
0b57bbe184 Update iv_drip.dm 2017-08-20 09:50:22 -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
LetterJay
46e7d7a9c4 Merge branch 'master' into upstream-merge-29647 2017-08-19 12:25:49 -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