shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,781 Commits 5 Branches 0 Tags
23b45c9cf3bbee22d00bb6681ba044bec543cfca
Commit Graph

13955 Commits

Author SHA1 Message Date
Ghom
a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
Ghom
d693d3ef26 Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4 
datum pipeline null gasmix stack trace now gives a REF()
 2020-04-12 05:46:07 +02:00
Ghom
1babc75a69 Merge pull request #11818 from spookydonut/patch-1 
Update spacemandmm to 1.4
 2020-04-11 23:59:31 +02:00
spookydonut
a6f6a27c87 Update code/modules/vending/_vending.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-12 00:53:57 +08:00
Ghom
848c1996e4 Merge pull request #11806 from Citadel-Station-13/kevinz000-patch-3-1 
removes hotspot expose from skateboards
 2020-04-11 18:31:26 +02:00
Ghom
ae1785af70 Merge pull request #11802 from Akrilla/alien_attack 
Fixes attack_alien damage
 2020-04-11 18:31:07 +02:00
Ghom
11fa208838 Merge pull request #11800 from Akrilla/changling-readapt 
Fixes up changling readapting
 2020-04-11 18:30:49 +02:00
Ghom
f9f1bbc05f Merge pull request #11804 from Akrilla/beepsky-tie 
Fixes beepsky ziptie weirdness
 2020-04-11 13:40:24 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Akrilla
8abc0cc0a7 !on 2020-04-11 05:24:24 +01:00
Ghom
cd2edb3cf1 dont need to null when qdeling later (#11797) 2020-04-11 01:59:46 +02:00
Ghom
a75bd30911 Update carbon_defense.dm 2020-04-10 19:54:12 +02:00
Putnam3145
b939359e35 Made my choice thing actually... do something (#11787) 2020-04-10 18:16:19 +02:00
kevinz000
d5769a6ee4 Update carbon_defense.dm (#11738) 2020-04-10 18:13:50 +02:00
Arturlang
b40fb55539 Fixes mesmerzie and makes it work better (#11785) 
* Weh

* Mesmerize works a lot nicer now
 2020-04-10 15:41:35 +02:00
kevinz000
d19dd8f2e1 fixes baystruments (#11790) 
* fix

* sigh
 2020-04-10 15:36:42 +02:00
kevinz000
185b38e109 Update scooter.dm 2020-04-10 04:33:35 -07:00
kevinz000
9d931c0a3a Update datum_pipeline.dm 2020-04-10 04:32:16 -07:00
kevinz000
b09ac26ab2 Update scooter.dm 2020-04-10 04:25:53 -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
Akrilla
87dce0c3e9 dont need to null when qdeling later 2020-04-09 18:41:39 +01: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
bfad661c1c Merge pull request #11737 from Trilbyspaceclone/patch-330 
Buffs Stimpacks
 2020-04-09 06:57:13 -07:00
Putnam3145
5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +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
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
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
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
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