Commit Graph
13453 Commits
Author SHA1 Message Date
Ghommie 8764d781a3 Porting smartfridge improvements. 2019-06-19 04:28:36 +02:00
Ghommie 55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Ghommie df9c4fd1f4 [s] Ports "Fixes PDA TK exploits" 2019-06-19 03:08:44 +02:00
Fermi e0cada7965 Quick fix for a runtime 2019-06-19 01:08:23 +01:00
Fermi fec1df2098 Rephrasal for understanding. 2019-06-19 00:52:45 +01:00
Fermi 095ea1243b Fits better. 2019-06-19 00:39:38 +01:00
Ghommie db3d5848c2 Ports in beekini and bee socks. 2019-06-19 01:28:47 +02:00
Fermi 724ec93166 oops 2019-06-19 00:24:02 +01:00
Fermi f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Fermi 699b78dd80 Red pandas! 2019-06-18 23:00:54 +01:00
Ghommie f963ca050b thanks, badcoder trilby 2019-06-18 23:49:20 +02:00
Ghommie 3e834004ec Ports in bee plushes. 2019-06-18 23:31:09 +02:00
Ghommie 75a6068a86 Ports "Fixes advanced proc calls not working + various code cleaning" 2019-06-18 22:51:48 +02:00
kevinz000andGitHub 634f11d60d Update human.dm 2019-06-18 02:34:05 -07:00
Ghommie 4797a306cc applying suggestions. 2019-06-17 22:04:34 +02:00
TrilbyspacecloneandGitHub 4e1ac41393 Update species.dm 2019-06-17 14:41:06 -04:00
Sishen 95a6b5d7a9 Update arcade.dm 2019-06-17 14:35:24 -04:00
Sishen 96f0f0bd24 Update arcade.dm 2019-06-17 14:31:24 -04:00
Poojawaandkevinz000 bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07:00
Ghomandkevinz000 95dc8084f1 Moving some tablecrafting recipes to the appropriate categories (#8658)
* Moving some recipes to the appropriate categories

* Fixes the not-a-sandwich recipe being M.I.A.
2019-06-17 11:18:49 -07:00
Ghomandkevinz000 2845428c03 ports "Improve efficiency of SSmapping init" (#8651) 2019-06-17 11:18:28 -07:00
Ghomandkevinz000 d60a360e90 Ports "Removes firebug from goonchat" (#8650)
* Ports "Removes firebug from goonchat"

* fucking acient goonchat pre-sync stuff.
2019-06-17 11:17:38 -07:00
kevinz000andGitHub 4f42d40681 Merge pull request #8507 from Thalpy/Wheelchairs
Adds Hoverchairs and the paraplegic trait.
2019-06-17 11:13:43 -07:00
Fermi 0457026c0f Missed another. 2019-06-17 12:15:54 +01:00
ThalpyandGitHub 1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
Fermi dd7421f130 Missed one. 2019-06-17 12:05:21 +01:00
Fermi 02de745519 Merge branch 'Wheelchairs' of https://github.com/Thalpy/Citadel-Station-13 into Wheelchairs 2019-06-17 12:02:56 +01:00
Fermi 2681a8f7a9 Updates has_trait to HAS_TRAIT 2019-06-17 12:02:39 +01:00
Ghommie 9e122a520b 👀 2019-06-17 11:18:30 +02:00
Ghommie 6f03ac192b I read it wrong. 2019-06-17 10:57:59 +02:00
Ghommie 50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
Ghommie 1c93c43e20 Fixes roffle waffle, mushroom halluginogen and some invalid reagent. 2019-06-17 09:16:45 +02:00
Ghommie 8b5bab29b2 Buffs out certain stun spells. 2019-06-17 08:06:14 +02:00
BlackMajor 1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
deathride58andGitHub c6f3bd1fd1 Merge pull request #8575 from Citadel-Station-13/kevinz000-patch-41
nerfs disablers 3 --> 3.5 ds cooldown
2019-06-16 22:53:10 -04:00
deathride58andGitHub b487b0103b Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
2019-06-16 22:52:47 -04:00
deathride58andGitHub 7b329ae824 Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
2019-06-16 22:51:03 -04:00
deathride58andGitHub d0bc89353c Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48
pacifists can now let people piggyback (grab_passive). admins now can proccall buckle_mob on humans in a way that bypasses piggyback code block
2019-06-16 22:50:15 -04:00
kevinz000andGitHub 28ca8dee46 Merge pull request #8648 from Trilbyspaceclone/patch-178
Buffs uplink kits
2019-06-16 19:47:09 -07:00
kevinz000andGitHub 78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172
Organ Storage box
2019-06-16 19:43:10 -07:00
kevinz000andGitHub 302b235911 Merge pull request #8505 from BurgerLUA/RCDMEMES
Clockwork Cult walls can no longer be deconstructed by RCDs when heated.
2019-06-16 19:42:15 -07:00
kevinz000andGitHub 27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
2019-06-16 19:41:57 -07:00
kevinz000andGitHub 27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
2019-06-16 19:40:01 -07:00
kevinz000andGitHub 1739ee1685 Merge pull request #8578 from Ghommie/Ghommie-cit41
Clears up Extinguisher's slippery instructions.
2019-06-16 19:38:23 -07:00
kevinz000andGitHub b6aef75eed Merge pull request #8652 from Ghommie/Ghommie-cit53
Ports "areas_in_z after start population fix"
2019-06-16 19:35:55 -07:00
kevinz000andGitHub 430bc7f43f Merge pull request #8643 from Ghommie/Ghommie-cit48
Fixes the sacrificial target icon not displaying on the cult objective alert.
2019-06-16 19:35:28 -07:00
kevinz000andGitHub 1a6450a2e2 Merge pull request #8416 from Trilbyspaceclone/patch-135
Gives sec EVA suits storge some Sec Jetpacks
2019-06-16 19:35:05 -07:00
kevinz000andGitHub 6c560c566f Merge pull request #8579 from Trilbyspaceclone/patch-171
Gives gangs a new shield and makes their boots cheaper
2019-06-16 19:32:38 -07:00
kevinz000andGitHub 67a00c9141 Merge pull request #8614 from Ghommie/Ghommie-cit44
Portin "Fix chem dispensers starting with an extra power cell"
2019-06-16 19:31:08 -07:00