8019 Commits

Author	SHA1	Message	Date
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
kevinz000	52b189dc98	Merge pull request #8502 from Sishen1542/meatyors ... Meteor Sats not exclusive to station goal	2019-06-05 01:40:50 -07:00
kevinz000	58bdac6965	Merge pull request #8524 from BurgerLUA/Ass-Blast-USA ... Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.	2019-06-05 01:40:28 -07:00
kevinz000	81ba2011d3	Merge pull request #8510 from Sishen1542/ghostmanbad ... Subtle 2: No Ghost Boogaloo	2019-06-05 01:32:42 -07:00
BurgerLua	ed7d0575b2	Ass Blast USA	2019-06-03 14:40:57 -07:00
kevinz000	fc1611d86a	Merge pull request #8426 from Sishen1542/sloom-hnngh ... Slimespeak!	2019-06-03 00:51:36 -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	d4abb85641	Update preferences.dm	2019-06-02 09:40:18 -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
Sishen	9347ad57b1	sneaky erp	2019-06-01 20:20:55 -04:00
Sishen	9aaeed6f81	Update packs.dm	2019-06-01 19:46:09 -04:00
kevinz000	70bad08f95	Merge pull request #8473 from Useroth/clown-fu ... [MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.	2019-05-31 19:23:03 -07:00
Useroth	a46312ede6	Update godhand.dm	2019-06-01 04:20:27 +02:00
kevinz000	e63f9f385b	Merge pull request #8359 from Useroth/pneumatic-and-stun-buff ... [MERGE READY]Reduces the complexity of the two new circuits: pneumatic cannon and stunner.	2019-05-31 19:18:53 -07:00
Useroth	8af39b8da7	Update godhand.dm	2019-06-01 04:16:37 +02:00
Sishen	5dde4555cc	lmao2crate	2019-05-31 21:11:39 -04:00
kevinz000	32f6427cf1	Merge pull request #8434 from Ghommie/Ghommie-cit16 ... I'm tired of my pulls on horizontal spacemen breaking off because of crawling delays.	2019-05-31 18:00:47 -07:00
kevinz000	8b27926fee	Merge pull request #8463 from Trilbyspaceclone/metal_shields ... Makeshift Metal shield crafting	2019-05-31 18:00:12 -07:00
kevinz000	140e065525	Merge pull request #8495 from BurgerLUA/Anti-Obese ... Obesity is now a warning instead of a notice.	2019-05-31 17:59:09 -07: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	7507831ffa	Merge pull request #8449 from Trilbyspaceclone/patch-144 ... Makes PDA bomb cart cost 5 not 6	2019-05-31 17:52:40 -07:00
kevinz000	c645d2129f	Merge pull request #8453 from Trilbyspaceclone/patch-148 ... Tuberculosis 12tc - > 8tc	2019-05-31 17:52:25 -07:00
kevinz000	4224606c5f	Merge pull request #8452 from Trilbyspaceclone/patch-147 ... Makes mulligan cost only 3	2019-05-31 17:50:59 -07:00
kevinz000	61f9c2edcd	Merge pull request #8461 from Trilbyspaceclone/patch-155 ... Makes golden toolboxes cost 3 not 5	2019-05-31 17:47:08 -07:00
kevinz000	14d763bd1d	Merge pull request #8459 from Trilbyspaceclone/patch-153 ... Syndicate Sentience Potion costing 2 from 4	2019-05-31 17:46:44 -07:00
kevinz000	8c6d8eb20b	Merge pull request #8471 from Sishen1542/buttslol ... Butt slaps fix & Masochism! (fixed)	2019-05-31 17:45:07 -07:00
kevinz000	854eb129f6	Merge pull request #8462 from Trilbyspaceclone/patch-156 ... Makes brainwash disks cost 3 tc not 5	2019-05-31 17:43:53 -07:00
kevinz000	1efdfd38e0	Merge pull request #8436 from Trilbyspaceclone/patch-137 ... Allows bio genes to make synth meat	2019-05-31 17:43:22 -07:00
kevinz000	f678741a0e	Merge pull request #8470 from Ghommie/Ghommie-cit19 ... Undunks pepper spray & teargas.	2019-05-31 17:42:28 -07:00
kevinz000	ca16cd9467	Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS ... [Ready] High alarm ERT suits	2019-05-31 17:41:39 -07:00
kevinz000	a96e414d2f	Merge pull request #8486 from BlackMajor/Ooga ... Supermatter no longer works while inside of a turf.	2019-05-31 17:40:30 -07:00
BurgerLua	5dc3542f90	added	2019-05-30 15:49:53 -07:00
kevinz000	f5b3484e92	Merge pull request #8295 from Trilbyspaceclone/T_T ... [Ready] Nerfs(Not really) Engi printing and organized many designs	2019-05-30 11:12:35 -07:00
Trilbyspaceclone	a8ec60d9c1	Update miscellaneous.dm	2019-05-30 13:51:55 -04:00
Trilbyspaceclone	39700503f9	Update miscellaneous.dm	2019-05-30 11:40:37 -04:00
Trilbyspaceclone	618c2c070c	Update ert.dm	2019-05-30 11:36:20 -04:00
BlackMajor	0d06605662	Supermatter eats the closed turf it's inside. ... Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.	2019-05-30 16:17:33 +12:00
Useroth	d8d9d6efeb	Tweaks. Also, eating human pies makes them chestburst you a'la monkey cubes.	2019-05-29 23:45:25 +02:00
Useroth	16826eba66	Tweaks n' stuff.	2019-05-29 08:45:21 +02:00
deathride58	3feb11f12a	Ports the zulie cloak and blackredgold coat donor items from RP	2019-05-28 19:38:08 -04:00
Useroth	848f3910e6	Oops. Now it compiles fine.	2019-05-28 09:32:59 +02:00
Useroth	eb6e710b18	Forgot to uncomment the clown check on the shoes.	2019-05-28 09:17:03 +02:00
Useroth	bd4108c094	...	2019-05-28 09:04:13 +02:00
Useroth	939eb35a3f	Tae-clown-do v1	2019-05-28 09:02:26 +02:00
Sishen1542	c57968ec13	Update code/modules/mob/living/carbon/human/species.dm ... Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2019-05-28 00:29:56 -04:00
Sishen	6707d1b2fd	Update species.dm	2019-05-27 23:24:52 -04:00