Commit Graph
21577 Commits
Author SHA1 Message Date
kevinz000 d658a0c1d4 k 2020-04-10 00:21:40 -07:00
kevinz000 be398004b7 groan 2020-04-10 00:16:43 -07:00
kevinz000 a9e738b8b1 k 2020-04-09 23:14:07 -07:00
kevinz000 9b13f009fe k 2020-04-09 23:12:37 -07:00
kevinz000 ffe206f3e1 k 2020-04-09 22:33:54 -07:00
kevinz000 00ebd842b8 k 2020-04-09 22:17:42 -07:00
kevinz000 a559fef230 runtime 2020-04-09 22:12:39 -07:00
kevinz000 d149ce47a6 ok 2020-04-09 21:31:35 -07:00
kevinz000 0a67f5c6ea compile 2020-04-09 21:30:42 -07:00
Akrilla 2a05903808 do_after 2020-04-10 04:26:35 +01:00
Akrilla 5c74e239a0 wew 2020-04-10 03:43:18 +01:00
Akrilla ec5db05bdc fixes up readapting 2020-04-10 03:18:13 +01:00
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
AkrillaandGitHub 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
TrilbyspacecloneandGitHub 9bf84aca32 grammar 2020-04-09 13:18:55 -04:00
Putnam3145andGitHub 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
ArturlangandGitHub f80900fd0b Fixes vendors not eating coins (#11795) 2020-04-09 19:07:11 +02:00
kevinz000andGitHub 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
kevinz000andGitHub bfad661c1c Merge pull request #11737 from Trilbyspaceclone/patch-330
Buffs Stimpacks
2020-04-09 06:57:13 -07: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
Putnam3145andGitHub 5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +02:00
GhomandGitHub 98312ec2c8 Update radiation.dm 2020-04-09 14:21:15 +02:00
GhomandGitHub 3433205130 Makes radioactive atoms actually still radiate other atoms within itself even if contained. 2020-04-09 13:56:19 +02:00
kevinz000andGitHub 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
kevinz000andGitHub a08536b0ff Merge pull request #11778 from kappa-sama/patch-17
shamelessly nerfs purified claymore
2020-04-09 02:41:40 -07:00
kevinz000andGitHub 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
kevinz000andGitHub f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting
Frail crafting - Glass work additions and changes!
2020-04-09 02:41:01 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms
Makes upgrading telecoms more usefull
2020-04-09 02:38:10 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
kevinz000andGitHub 9208c42747 Merge pull request #11722 from timothyteakettle/bye-separated-chems
goodbye separated chemicals
2020-04-09 02:02:55 -07:00
Putnam3145andGitHub 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
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
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
TrilbyspacecloneandGitHub f1deea99f7 adds back in the containment bag 2020-04-08 05:38:36 -04:00