shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,151 Commits 5 Branches 0 Tags
6ead9bbe6580e4e895332ff707dfd73ae0ebc8f3
Commit Graph

804 Commits

Author SHA1 Message Date
AnalWerewolf 8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
Thalpy 628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
kevinz000 be9a551eea Merge pull request #8566 from Ghommie/Ghommie-cit39 
Different combat mode message if user is on help intent.
 2019-06-08 12:05:17 -07:00
Ghommie 53d5ad5820 no exclamation point. 2019-06-08 14:45:26 +02:00
Ghommie fc536dcfe4 Urist McSpaceman goes vigilant! 
Urist McSpaceman seems attentive!
Urist McSpaceman looks alert!
 2019-06-08 14:44:40 +02:00
kevinz000 eb1c767ab7 Merge pull request #8553 from Poojawa/ghost-erp 
Clarifies a few things about subtler and how it should be used
 2019-06-08 01:24:36 -07:00
kevinz000 1ad200fcf4 Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl 
Schoolgirl outfits for the loadout menu
 2019-06-08 01:22:52 -07:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie 57246b5c4f No combat mode message if user is on help intent. 2019-06-07 19:36:09 +02:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
AnalWerewolf 4ff12eebd0 he bork and he woof 2019-06-07 18:10:22 +10:00
Poojawa 67eb76b360 clarifies a few things 2019-06-06 18:56:26 -05:00
dtfe3 0b1da3f025 Update uniform.dm 2019-06-06 20:50:14 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000 980c48180c Merge pull request #8387 from JTGSZ/gangs 
Ports gang mode
 2019-06-05 01:55:19 -07:00
kevinz000 cd38a29449 Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals 
Ports RP's deer taur and adds Elven ears to mammals
 2019-06-05 01:44:05 -07:00
Poojawa 25458fad63 I refuse to eat crow. 2019-06-02 08:40:51 -05:00
Poojawa 69b1373209 compile testing and tweaks 2019-06-02 08:06:16 -05:00
Poojawa 818ec19561 Working as intended, fixed a few other missing sprites 
Started groundwork for multi-breasts and hidden balls.
 2019-06-02 04:44:57 -05:00
Poojawa 17ad519f24 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess 2019-06-02 03:00:46 -05:00
Fermi 0105dbf562 Removed duplicate headpat code. 2019-06-01 20:04:41 +01:00
Fermi 5918b026aa Fixes, PLEASE CHECK HEADPATS IN MOODULAR. 2019-06-01 20:02:51 +01:00
CalamaBanana a37f84fb9b Ports RP Deer taur and adds Elf Ears to Mammals 
Ports RP Deer taur and adds Elf Ears to Mammals
 2019-06-01 17:28:17 +02:00
kevinz000 59e88e0808 Merge pull request #8477 from deathride58/portsnerditems 
Ports the zulie cloak and blackredgold coat donor items from RP
 2019-05-31 17:58:48 -07:00
kevinz000 8c6d8eb20b Merge pull request #8471 from Sishen1542/buttslol 
Butt slaps fix & Masochism! (fixed)
 2019-05-31 17:45:07 -07:00
deathride58 9e35f91706 suggested changes from asky 2019-05-30 13:18:05 -04:00
deathride58 3feb11f12a Ports the zulie cloak and blackredgold coat donor items from RP 2019-05-28 19:38:08 -04:00
Sishen 8771ae5822 masochism and buttslap fixes 2019-05-27 18:51:52 -04:00
kevinz000 aca63ebea3 Merge pull request #8408 from Ghommie/Ghommie-cit13 
Fixing cult rounds potentially stalling if the sac target is erased from this realm.
 2019-05-27 15:09:11 -07:00
JTGSZ 93813613aa Some changes. 2019-05-27 14:42:07 -04:00
Poojawa 2aa86157e1 Fixes rendering issues. Adds balls to be rendered 2019-05-26 04:52:31 -05:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
kevinz000 0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118 
[Ready] Cleaner looking autolathen organization
 2019-05-25 11:51:17 -07:00
kevinz000 e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes 
Changed arousal message styling.
 2019-05-25 11:30:18 -07:00
kevinz000 97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad 
Fixes species getting genitals at all if NOGENITAL'd
 2019-05-25 11:13:55 -07:00
JTGSZ 38ad6785a0 Over-reduced the item costs a bit too much. 
Lets do it in tiny increments until It plays somewhat unpredictably for all sides.
 2019-05-23 01:42:00 -04:00
JTGSZ 080b29de79 Solves a few things. 2019-05-23 00:40:57 -04:00
Ghommie 4998b7cfa1 Actually, the cult team should process it instead. 
Got you covered, badmins spawning cult on other modes.
 2019-05-22 18:43:26 +02:00
Trilbyspaceclone 3bf667ba36 Update magweapon_energy.dm 2019-05-22 12:42:28 -04:00
Trilbyspaceclone 005647d4f6 Update magweapon_energy.dm 2019-05-22 12:12:06 -04:00
Poojawa 25463f22b2 Fixes species getting genitals at all if NOGENITAL'd 
Holy FUCK this code is bad.
 2019-05-21 23:52:19 -05:00
Ghommie 6bb70297ec Why did you check if the gamemode's type is an antagonist datum? 
And why did it sort of work too?
I don't understand.
Pooj's copypasting this black magic, smh.
 2019-05-22 06:09:18 +02:00
JTGSZ 84016ed3ef Here we go. 2019-05-21 12:30:44 -04:00
deathride58 d40d9791c4 Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41 
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
 2019-05-21 08:06:21 -04:00
kevinz000 a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker 
[Ready]Makes a blue space bike horn HONK
 2019-05-20 23:40:17 -07:00
kevinz000 74af355079 Merge pull request #8392 from Poojawa/donator-item-fixing 
Fixes Kiara's sabre belt icons, fixes armor offsets for taurs
 2019-05-20 23:30:28 -07:00
Carlen White e77f30d803 Slight change for aphrodisiacs to use the new userlove style. 2019-05-21 01:39:00 -04:00
Carlen White 51f2a37e6e Changed arousal message styling. 
Now with less gaudy green.
 2019-05-20 17:47:10 -04:00
kevinz000 626ede8464 Merge pull request #8367 from Poojawa/genital-improvements 
[READY] Genital fixes and skintone sync [Adds erections[]
 2019-05-19 22:47:01 -07:00
kevinz000 8ceec4271e Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle 
Simple Mob vore toggle works again
 2019-05-19 12:46:13 -07:00