shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,405 Commits 5 Branches 0 Tags
f2f147412361b06be037cc405229d9f322f0efab
Commit Graph
4405 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 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 a6eb648f96 i hate the webeditor 2017-08-21 20:07:59 -05:00
LetterJayandGitHub 83f4733027 Rename _circuitboard.dm to circuitboard.dm 2017-08-21 20:01:59 -05:00
LetterJayandGitHub c41f948b6f Update tgstation.dme 2017-08-21 19:55:22 -05:00
LetterJayandGitHub 362eb50d27 Update tgstation.dme 2017-08-21 19:46:13 -05:00
LetterJayandGitHub 9b049e6f49 Rename machinery.dm to _machinery.dm 2017-08-21 19:42:43 -05:00
LetterJayandGitHub 41c310be8f Update tgstation.dme 2017-08-21 19:36:10 -05:00
Poojawaandkevinz000 91fc414b20 Changes Ghost role ping sound effects (#2441) 
* change that fucking blare

* Update xenobiology.dm
 2017-08-21 17:05:09 -07:00
ktccdandkevinz000 597c048975 This was bothering me (#2449) 
Now it's fixed.
 2017-08-21 17:03:41 -07:00
CitadelStationBot a09c49a0be Automatic changelog generation for PR #2448 [ci skip] 2017-08-21 19:03:31 -05:00
ktccdandkevinz000 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
LetterJayandGitHub 7adf3b03a6 Merge pull request #2446 from Citadel-Station-13/upstream-merge-30024 
[MIRROR] Makes the Ark of the Clockwork Justicar much more fancy
 2017-08-21 02:07:57 -05:00
CitadelStationBot 772299445e Makes the Ark of the Clockwork Justicar much more fancy 2017-08-20 19:55:15 -05:00
LetterJayandGitHub 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
LetterJayandGitHub ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJayandGitHub 940f5da5fd Rename _machinery.dm to machinery.dm 2017-08-20 09:52:28 -05:00
LetterJayandGitHub 08bbe72923 Update portable_turret.dm 2017-08-20 09:50:56 -05:00
LetterJayandGitHub 0b57bbe184 Update iv_drip.dm 2017-08-20 09:50:22 -05:00
CitadelStationBot 5ddf45ca5d Automatic changelog generation for PR #2438 [ci skip] 2017-08-20 09:47:50 -05:00
LetterJayandGitHub 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
CitadelStationBot 1e34378dbd Automatic changelog generation for PR #2439 [ci skip] 2017-08-20 09:47:34 -05:00
LetterJayandGitHub 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
CitadelStationBot 257d864286 Automatic changelog generation for PR #2437 [ci skip] 2017-08-20 09:47:13 -05:00
LetterJayandGitHub ece00b3ff0 Merge pull request #2437 from Citadel-Station-13/upstream-merge-30014 
[MIRROR] fixed delta's n2o console and adds fireaxe to atmos
 2017-08-20 09:47:11 -05:00
LetterJayandGitHub a389945f28 Merge pull request #2434 from Citadel-Station-13/upstream-merge-30012 
[MIRROR] Patch DMITool's import to accept pngs with no alpha channel
 2017-08-20 09:46:55 -05:00
CitadelStationBot 1ea86e5abd Automatic changelog generation for PR #2357 [ci skip] 2017-08-19 21:01:04 -05:00
ktccdandkevinz000 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
CitadelStationBotandkevinz000 6541ea749c Fixes midi2piano (#2433) 2017-08-19 18:59:35 -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 c09ec3eb91 fixed delta's n2o console and adds fireaxe to atmos 2017-08-19 18:41:30 -05:00
CitadelStationBot bc121da0af Gives SSdisease SS_NO_INIT 2017-08-19 18:40:18 -05:00
CitadelStationBot 10807cb1b9 Patch DMITool's import to accept pngs with no alpha channel 2017-08-19 18:39:13 -05:00
LetterJayandGitHub 9da30ff9f3 Merge pull request #2427 from Citadel-Station-13/upstream-merge-29997 
[MIRROR] readds toggle_hear_radio admin verb
 2017-08-19 12:25:14 -05:00
CitadelStationBot da6e3d7c8e readds toggle_hear_radio admin verb 2017-08-19 06:45:50 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 7296191a1b Merge pull request #2423 from Citadel-Station-13/upstream-merge-29899 
[MIRROR] Adds a warning to the traitor panel for the last headrev
 2017-08-18 22:43:49 -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
CactusandGitHub 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
CactusandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 2c33ef3ab0 Update component.dm 2017-08-18 13:56:47 -05:00
CitadelStationBot b4431f3840 Automatic changelog generation for PR #2362 [ci skip] 2017-08-18 13:41:38 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 19b8a5a380 Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858 
[MIRROR] Fixed sign description
 2017-08-18 13:41:07 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 094c4847f7 Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849 
[MIRROR] More baseturf helpers
 2017-08-18 11:26:53 -05:00
LetterJayandGitHub 8a7c0e657f Update powers.dm 2017-08-18 11:20:36 -05:00