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

702 Commits

Author SHA1 Message Date
CitadelStationBot
2ff65a8e39 [MIRROR] Lowers the chance for monkeys to become gorillas (#2476) 
* Lowers the chance for monkeys to become gorillas

* Delete life.dm.rej

* Update life.dm
 2017-08-29 00:59:34 -07:00
LetterJay
7ea6eeb64e GUHRILLAZ 2017-08-28 10:23:11 -05:00
LetterJay
defab9c7fc Merge branch 'master' into upstream-merge-29923 2017-08-28 09:19:44 -05:00
LetterJay
03a26e6468 Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5 
absolute pathing for mammals
 2017-08-28 08:56:55 -05:00
LetterJay
c043b8a1d5 Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182 
[MIRROR] Holoparasite prompts now have a "Never For This Round" option
 2017-08-28 08:46:19 -05:00
kevinz000
5ebf1c4b6b Update furrypeople.dm 2017-08-27 19:48:29 -07:00
CitadelStationBot
349bd03b73 Adds periods to larva roars (#2512) 2017-08-27 06:42:16 -07:00
CitadelStationBot
94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
ktccd
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
kevinz000
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
ktccd
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
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
CitadelStationBot
d38580afcd Holoparasite prompts now have a "Never For This Round" option 2017-08-26 11:07:20 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
d5dfe45c1e Dummies no longer queue, which humans probably shouldn't do ever (#2477) 2017-08-24 18:30:51 -07:00
kevinz000
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
kevinz000
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
LetterJay
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
kevinz000
d56cc32cf0 Update human.dm 2017-08-21 21:43:17 -07:00
kevinz000
4316a5a61b Update human.dm 2017-08-21 21:41:59 -07:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
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
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
CitadelStationBot
999c921f63 Removes the chat message from *spin (#2428) 2017-08-21 19:54:24 -07: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
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
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
CitadelStationBot
41b0f9f9d4 Gorillas 2017-08-20 19:56:21 -05:00
LetterJay
ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -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
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
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
b3e984af5b Update furrypeople.dm 2017-08-16 09:41:55 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
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
LetterJay
de009b5283 Merge pull request #2374 from sirelgate/master 
xenomorph round start update
 2017-08-15 10:20:57 -05:00