shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,471 Commits 5 Branches 0 Tags
472e39693f0ad4308e343a209a2bf3cd5fc372e5
Commit Graph
596 Commits
Author SHA1 Message Date
CitadelStationBotandkevinz000 349bd03b73 Adds periods to larva roars (#2512) 2017-08-27 06:42:16 -07:00
CitadelStationBotandkevinz000 94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
ktccdandkevinz000 985ea0d768 Sets all food prefs to NONE (#2517) 
People can RP their food likes/dislikes. This stuff, like deciding what
is/isn't edible to slimes and such is unasked for and unecessary.
Also, they didn't address that this stealth-nerfs non-humans as
donk-pockets and such food items were put in a lot of places, expecting
to be used for healing, but can now not be eaten by, for example,
lizards.
 2017-08-27 05:54:48 -07:00
kevinz000andGitHub 68f463452e Revert "Lets humans use MUTCOLORs [Maximum Heresy]" - turns out this is breaking things (#2516) 
fine ktccd il do it
 2017-08-27 04:21:29 -07:00
ktccdandkevinz000 e6114f7840 Makes humans use MUTCOLORS (#2513) 
Exactly what it sounds like. Enables humans to use mutant colours and
disables the preset skintones.
Preset skintones are still doable, since mutant colours can be
accurately adjusted by putting in RGB values for the colours, but it'd
be more manual work. On the other hand, you can now get a more accurate
skin tone...
 2017-08-27 00:58:50 -07:00
kevinz000andGitHub 3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBotandkevinz000 d5dfe45c1e Dummies no longer queue, which humans probably shouldn't do ever (#2477) 2017-08-24 18:30:51 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJayandGitHub 2954e8ad16 Merge pull request #2455 from Citadel-Station-13/kevinz000-patch-4 
Makes beepsky stop bullying 2hus
 2017-08-22 02:29:13 -05:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
kevinz000andGitHub d56cc32cf0 Update human.dm 2017-08-21 21:43:17 -07:00
kevinz000andGitHub 4316a5a61b Update human.dm 2017-08-21 21:41:59 -07:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBotandkevinz000 999c921f63 Removes the chat message from *spin (#2428) 2017-08-21 19:54:24 -07:00
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
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 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 ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 2a2e4b2af4 Improves attack logging of pulling / grabbing / throwing 2017-08-17 09:19:05 -05:00
LetterJayandGitHub 2b9f59ca3d bonesless pizza 2017-08-16 15:06:16 -05:00
LetterJayandGitHub 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
LetterJayandGitHub b3e984af5b Update furrypeople.dm 2017-08-16 09:41:55 -05:00
LetterJayandGitHub 0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJayandGitHub ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
Haresay 67cd217681 bumped heat damage after calculating armor 2017-08-15 10:19:38 -06:00
CitadelStationBot 3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
Haresay b65234b733 rebalanced armor downward, removed stunmod, and made more vulnerable to heat thanks to Pierceimmune being added 2017-08-15 09:33:31 -06:00
Haresay 7eaaa2e647 lowered armor value,in search of fixing digitigradelegs 2017-08-15 09:25:51 -06:00
Haresay 93ae8c0e44 did some number crunching in regards to armor and practiced, balanced more, still no shoes from digitgrade 2017-08-15 09:21:08 -06:00
LetterJayandGitHub de009b5283 Merge pull request #2374 from sirelgate/master 
xenomorph round start update
 2017-08-15 10:20:57 -05:00
Haresay 1cc9a1decf set xeno standard parts to be default 2017-08-15 08:06:59 -06:00
Haresay 22ad3c6afe xeno markings addition 
added markings to the xenomorph, for polish
 2017-08-15 08:03:08 -06:00
LetterJayandGitHub e5cd79a14e Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854 
[MIRROR] Moved can_trigger_gun to item/weapon parent
 2017-08-14 18:53:38 -05:00
LetterJayandGitHub 6d62d51eab Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288 
[MIRROR] Hallucinations 3.0
 2017-08-14 18:45:45 -05:00
LetterJayandGitHub ce918273bc Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779 
[MIRROR] Fixes the Hierophant not spawning its crusher trophy
 2017-08-14 18:45:28 -05:00
LetterJayandGitHub 69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
Haresay 048c782156 xenomorph update 
A long overdue overhall and readdition of xenos
 2017-08-14 17:09:11 -06:00
CitadelStationBot 97243fca3a Moved can_trigger_gun to item/weapon parent 2017-08-14 16:05:43 -05:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
LetterJayandGitHub 3876ecab9e Merge pull request #2354 from Citadel-Station-13/upstream-merge-29853 
[MIRROR] critical priority roleplay grammatical patch (*surrender emote fix)
 2017-08-13 09:52:46 -05:00
CitadelStationBot dae3e121f2 critical priority roleplay grammatical patch (*surrender emote fix) 2017-08-13 01:28:16 -05:00