Commit Graph

21775 Commits

Author SHA1 Message Date
Artur fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Akrilla 753be141be show pref change (#11793) 2020-04-09 20:32:50 +02:00
Akrilla 87dce0c3e9 dont need to null when qdeling later 2020-04-09 18:41:39 +01:00
Timothy Teakettle cfec83b8a2 what if butchering didnt suck! 2020-04-09 18:38:29 +01:00
Trilbyspaceclone 9bf84aca32 grammar 2020-04-09 13:18:55 -04:00
Putnam3145 a203ef7de5 Merge pull request #11794 from Citadel-Station-13/kevinz000-patch-1
DefaultCombatKnockdown now respects CANKNOCKDOWN status flag
2020-04-09 10:07:25 -07:00
Arturlang f80900fd0b Fixes vendors not eating coins (#11795) 2020-04-09 19:07:11 +02:00
kevinz000 0cd7437f49 Update status_procs.dm 2020-04-09 09:33:21 -07:00
kevinz000 2e9e38cd89 close 2020-04-09 09:30:34 -07:00
kevinz000 857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000 e6f98fa270 compile 2020-04-09 09:16:46 -07:00
Timothy Teakettle 7fe5bb71d7 more quality 2020-04-09 16:07:45 +01:00
Timothy Teakettle 47be942c92 more quality 2020-04-09 15:29:10 +01:00
kevinz000 bfad661c1c Merge pull request #11737 from Trilbyspaceclone/patch-330
Buffs Stimpacks
2020-04-09 06:57:13 -07:00
Timothy Teakettle 97dcb9ed84 fried garbage is now better 2020-04-09 14:50:11 +01:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Ghommie d2b624a908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-09 14:59:40 +02:00
Putnam3145 5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +02:00
Timothy Teakettle 7fba81f36e people are more picky about food 2020-04-09 13:32:02 +01:00
Ghom 98312ec2c8 Update radiation.dm 2020-04-09 14:21:15 +02:00
Ghom 3433205130 Makes radioactive atoms actually still radiate other atoms within itself even if contained. 2020-04-09 13:56:19 +02:00
kevinz000 7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix
TGUI Next vendors plus spritesheet port from TG
2020-04-09 03:53:08 -07:00
kevinz000 e3c6ebb81e compile 2020-04-09 02:54:29 -07:00
kevinz000 a888c7c29a continue 2020-04-09 02:52:32 -07:00
kevinz000 a08536b0ff Merge pull request #11778 from kappa-sama/patch-17
shamelessly nerfs purified claymore
2020-04-09 02:41:40 -07:00
kevinz000 aee2f46b8d Merge pull request #11777 from Ghommie/Ghommie-cit670
Makes RAD_PROTECT_CONTENTS radiation flag protect both ways.
2020-04-09 02:41:21 -07:00
kevinz000 f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting
Frail crafting - Glass work additions and changes!
2020-04-09 02:41:01 -07:00
kevinz000 ba4585951e Merge pull request #11765 from Putnam3145/dynamic-chaos-weight
Makes intrigue, classic, story storytellers have their chaos weighted by recent round chaos
2020-04-09 02:40:25 -07:00
kevinz000 22bf4cdb83 Merge pull request #11760 from Trilbyspaceclone/10mmchanges
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
2020-04-09 02:38:44 -07:00
kevinz000 779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms
Makes upgrading telecoms more usefull
2020-04-09 02:38:10 -07:00
kevinz000 b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden
Atomic PR 1 or 2 - Toilet Mapping!
2020-04-09 02:11:43 -07:00
kevinz000 956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
kevinz000 9208c42747 Merge pull request #11722 from timothyteakettle/bye-separated-chems
goodbye separated chemicals
2020-04-09 02:02:55 -07:00
Putnam3145 474d6a486d Merge pull request #11773 from Arturlang/cablefix
Fixes cablecuff making producing 0 amount cables
2020-04-09 01:28:30 -07:00
Artur 0a234d5618 TABS NOT SPACES
AAAAAAAA
2020-04-09 09:32:23 +03:00
timothyteakettle d985ea8c84 more quality 2020-04-09 02:51:32 +01:00
timothyteakettle 20d4172030 more quality 2020-04-09 02:10:00 +01:00
timothyteakettle a90f3d9d2b woops 2020-04-09 01:46:47 +01:00
timothyteakettle 792be6e146 more food quality 2020-04-09 01:36:15 +01:00
timothyteakettle bc6294baa9 i too, like food quality. 2020-04-09 01:10:34 +01:00
Artur 75a2dd6900 Finnishing touches, hopefully
Tweaks some indendation
2020-04-08 18:32:45 +03:00
Artur 3cf6524389 Makes it nicer, removes check_cable_amount
Putnam suggested this as well
2020-04-08 18:28:35 +03:00
Arturlang cdd2f55cac Putnams suggestion
Makes use() a if, as to use it as a further sanity check

Co-Authored-By: Putnam3145 <putnam3145@gmail.com>
2020-04-08 18:24:14 +03:00
Artur 5fbe05f3c9 Cleaning up and finishing up 2020-04-08 18:16:10 +03:00
necromanceranne 2becb6d74f not really relevant given I literally decided to axe the mod 2020-04-09 00:44:01 +10:00
necromanceranne ad09cb6790 This needs to go, there is just no way to reasonably have this mod as of the moment while it is basically giving a universal stamina discount. 2020-04-09 00:07:54 +10:00
necromanceranne f0a738ef21 I'm sneaking in a nerf to scarp here shush shush 2020-04-08 22:53:51 +10:00
Trilbyspaceclone f1deea99f7 adds back in the containment bag 2020-04-08 05:38:36 -04:00
kevinz000 a071a5f2f6 ok 2020-04-08 01:05:09 -07:00
kevinz000 33aa16bfcf ok 2020-04-08 01:04:56 -07:00