shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,356 Commits 5 Branches 0 Tags
8149eebb3be857ea1ff34ecf05bdfd4ce744e3d5
Commit Graph

14255 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Trilbyspaceclone
f1deea99f7 adds back in the containment bag 2020-04-08 05:38:36 -04:00
kevinz000
7ec669ecd4 bet 2020-04-07 16:11:58 -07:00
Trilbyspaceclone
97dbd6ae7f Update parts.dm 2020-04-07 18:38:53 -04:00
TrilbySpaceClone
b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone
e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
Lin
395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 
Bringing back accidentally reverted solar panel fixes.
 2020-04-07 19:59:48 +00:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Artur
c9ab705c80 Ghommies suggestion 2020-04-07 16:08:38 +03:00
TrilbySpaceClone
1f51e73dd6 more rng 2020-04-07 08:43:18 -04:00
Artur
c4ff1cd322 Coding is hard, mkay? 2020-04-07 14:39:00 +03:00
Putnam3145
dad6ddb042 Merge pull request #11764 from Ghommie/Ghommie-cit668 
Fixing spellcasting and edge cases.
 2020-04-07 02:50:24 -07:00
Putnam3145
536934d1e2 Merge pull request #11770 from Kraseo/i-hate-slimes 
The contractor pod now gives regen jelly instead of omnizine
 2020-04-07 02:43:33 -07:00
kevinz000
029f8ff698 Merge pull request #11763 from necromanceranne/popcap_time 
Pop caps Sleeping Carp and Rising Bass to 30 players.
 2020-04-07 01:58:14 -07:00
necromanceranne
b494aa3370 Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now 2020-04-07 17:51:25 +10:00
Trilbyspaceclone
8e64664295 Update science.dm 2020-04-07 03:45:23 -04:00
timothyteakettle
c28aa08c71 woops i didnt add it to the seed 2020-04-07 00:16:28 +01:00
Kraseo
f88d36addf quirky ass slime roundstart races 2020-04-07 01:12:21 +02:00
timothyteakettle
1b940a5464 space tobacco now has gaseous 2020-04-07 00:01:27 +01:00
timothyteakettle
378e188b3b goodbye slip prickles 2020-04-06 23:57:00 +01:00
kevinz000
ef0b81eabf Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4 
Fixed the epic nuke exploit
 2020-04-06 15:48:02 -07:00
kevinz000
d89170e441 Merge pull request #11748 from Trilbyspaceclone/patch-334 
Infested plasmamen now are miner type
 2020-04-06 15:47:00 -07:00