Commit Graph

886 Commits

Author SHA1 Message Date
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
kevinz000 a866ceb8a2 Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
2019-06-08 01:15:58 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie 44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie 0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
Trilbyspaceclone 7f8886f6e9 Update construction.dm 2019-06-05 20:06:37 -04:00
kevinz000 980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
kevinz000 adbbb2944a Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
Adds visible balls and multi-breasts
2019-06-05 01:42:48 -07:00
kevinz000 102d68a243 Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
2019-06-05 01:41:23 -07:00
BurgerLua ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
Ghommie 472d7ef8cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27 2019-06-02 19:03:34 +02:00
Ghommie d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02: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
Sishen 8771ae5822 masochism and buttslap fixes 2019-05-27 18:51:52 -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 d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
kevinz000 deffcb3226 Merge pull request #8398 from BurgerLUA/AntiAssSlap
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
2019-05-25 11:28:39 -07:00
BlackMajor f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
kevinz000 bcf78736ba Merge pull request #8385 from BlackMajor/Dunga
Adds a cream pie smite.
2019-05-20 23:32:27 -07:00
BurgerLua bcf563e132 Fixes ass slapping to be less annoying. 2019-05-20 21:53:47 -07: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 6c79587dad Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here!
Butt Slaps
2019-05-19 22:43:40 -07:00
JTGSZ 6c077758c6 ports gang 2019-05-18 05:06:22 -04:00
BlackMajor 00356ce980 Cream pie smite 2019-05-18 17:09:26 +12:00
Nero1024 2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
Poojawa b95bc24def mission accomplished 2019-05-17 04:24:23 -05:00
deathride58 cbac4b1daf Merge pull request #8330 from Scorpion-117/master
This is an entire addition to put stargazers back into clock cult.
2019-05-17 00:13:35 -04:00
Sishen ac04e23e31 Nympho Traiting & Arousal!
Butt slaps 2.0
Added nympho to defined traits, added arousal damage to ass slapping (arousal system needs to be enabled), and added forced orgasms to nymphos at max arousal
2019-05-16 10:17:16 -04:00
CalamaBanana 7cd74e6601 Adds pink to the circuit coloring tool 2019-05-15 00:07:53 +02:00
deathride58 06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
Scorpion-117 6e3722fede increased costs of power
with stargazers coming back I need  to jack up these values in order to compensate for the severe buff
2019-05-08 07:49:07 -06:00
deathride58 aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
2019-05-06 21:23:55 -04:00
BurgerLua 1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
kevinz000 534b5f0287 Merge pull request #8309 from Trilbyspaceclone/Food-5
Better sushi crafting, and tuna based food - Works addtion
2019-04-30 05:42:30 -07:00
Trilbyspaceclone 25df517ad5 Update construction.dm 2019-04-29 17:48:26 -04:00
BurgerLua 1f78520b68 Adds a new trait that makes you immune from the "positive" effects of hexacrocin and crocin. 2019-04-24 20:13:21 -07:00
kevinz000 a5e750e20f skintone 2019-04-23 19:06:00 -07:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58 b1467b4ec4 Optimizes memory usage even further by removing the list initialization in gas mixture new() in favor of having the lists start as empty lists. seems to save about 20mb of memory on box judging from one unscientific single test 2019-04-12 08:13:51 -04:00
Poojawa fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
deathride58 2078485594 minor code cleanup + fixes plasma fixation 2019-04-11 18:20:55 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
Poojawa 6a26220fea Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into muzzled-masks 2019-04-06 02:27:58 -05:00
deathride58 6259210a33 Merge pull request #8198 from Poojawa/Randomize-tweaks
Species Spawn tweaks and tauric plasmaman suit icons
2019-04-05 20:11:59 -04:00
Poojawa e3047cb69e fixes messy random spawn code
Humans return to having tail_human and ears. there's a reason these are seperated out. reee.
2019-04-02 02:29:37 -05:00
deathride58 c8d51c4231 Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time 2019-04-02 01:11:29 -04:00
Poojawa b11e3bbc96 Vore mode button and feeding 2019-03-25 04:19:00 -05:00