shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,919 Commits 5 Branches 0 Tags
101640170bd2f14bcd235668d33db9309ef49e64
Commit Graph

12500 Commits

Author SHA1 Message Date
MrJWhit
d314619d0e Comments out meteor defense tech node 
asdf
 2020-02-01 23:34:33 -05:00
Seris02
d3d4a9f05b Update code/modules/uplink/uplink_items/uplink_roles.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 12:21:32 +08:00
Seris02
8053e43838 Update code/modules/uplink/uplink_items/uplink_roles.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 12:21:26 +08:00
Ghommie
cbcb9f32ba Fixes maploaded APC terminals direction. 2020-02-02 04:21:30 +01:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Hatterhat
e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
Ghom
79387149a0 Fixes Space Ninja "Nothing" Objective. 2020-02-01 23:23:17 +01:00
Hatterhat
471deba88c large rcd carts 5head 2020-02-01 13:26:43 -06:00
Hatterhat
81cf670729 shit whoops 2020-02-01 13:22:16 -06:00
Ghom
6ae5ffddb1 Merge pull request #10731 from necromanceranne/howdoiswitchhands 
Energy crossbow changed from RNG to static effects
 2020-02-01 18:58:03 +01:00
Ghom
d523cfd95e Merge pull request #10806 from Feasel/master 
[Balance Patch - Tend Wounds Edition]
 2020-02-01 18:54:18 +01:00
Ghom
74ad10355c Merge pull request #10805 from Citadel-Station-13/i-hate-dueling 
guns/ammo/projectiles now properly clean up while being deleted
 2020-02-01 18:52:47 +01:00
Ghom
3337181cac Merge pull request #10352 from Seris02/smchanges 
Changes to the way SM handles power related to integrity and max integrity damage
 2020-02-01 18:46:10 +01:00
Ghom
051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization 
[READY]Ports TG updates to crafting and componentizes it
 2020-02-01 18:36:51 +01:00
Ghom
45af9dc013 Merge pull request #10808 from Arturlang/macros_begone 
[READY] Ports chem dispenser macro recording
 2020-02-01 18:22:57 +01:00
Putnam
3dcce2b43a added some cleanup code 2020-02-01 09:10:02 -08:00
Putnam
aba0379bfb also need these! 2020-02-01 08:53:19 -08:00
Putnam
463036a4f4 made panic bunker save in json 2020-02-01 08:44:05 -08:00
Putnam
d6d01d848c </span> 2020-02-01 06:01:54 -08:00
Artur
11fea908bd Fix and rebalance a lil 2020-02-01 14:11:34 +01:00
Putnam3145
12f0c35660 Merge pull request #10803 from Seris02/highlightfix 
fixes the whitespace that gets created when you have highlighting strings on
 2020-02-01 04:15:47 -08:00
Putnam3145
17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9 
fixes a very likely race condition in dueling pistols
 2020-02-01 04:15:32 -08:00
Winter Flare
59b5b0b9a6 A bunch of tiny tweaks. 
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
 2020-02-01 04:49:56 -05:00
Ghom
ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches 
[s] fixes a glitch with the PKA
 2020-02-01 10:06:58 +01:00
Putnam3145
33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Putnam
7e3ea27ff4 dumb formatting. dumb dumb. 2020-02-01 00:42:25 -08:00
Putnam
847e6382c0 fixes some quirk stuff 2020-02-01 00:32:08 -08:00
Putnam
3d9e84a3f8 Tweaks and fixes 2020-02-01 00:23:45 -08:00
Seris02
3c8dcbbcd2 merp 2020-02-01 16:02:30 +08:00
Ghommie
8923810de2 Something about runtime errors. 2020-02-01 07:19:49 +01:00
Ghommie
c75774e67a Actual var. 2020-02-01 06:20:23 +01:00
Ghommie
ef3789eeb2 Playback device peeve. 2020-02-01 06:18:22 +01:00
Seris02
fc70b88b06 actually we only need it here 2020-02-01 11:51:15 +08:00
Seris02
20308b54dd exploit fix 2020-02-01 11:48:55 +08:00
Ghommie
07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
necromanceranne
66862db7ab Last change to this, now the damage is respected by energy armor 2020-02-01 14:07:23 +11:00
Winter Flare
599185654f Rename, Add item to Loadout 
Renamed scrubs based on color, added Mailman Hat to loadout.
 2020-01-31 21:54:21 -05:00
Hatterhat
be525e3f58 good ol twoliner prs 2020-01-31 20:05:27 -06:00
Artur
b4763d947e Kills macrotier 2020-02-01 03:03:55 +01:00
Ghom
1745308cc5 Forgot about this. 2020-02-01 02:14:14 +01:00
Ghom
5257ab2e00 Merge pull request #10559 from Seris02/custompie 
custom reagent pie smite
 2020-02-01 01:46:15 +01:00
Ghom
7fdabe81ab Merge pull request #10776 from Hatterhat/hecksuitgolres 
heck suit resistances - goliath resistance and also acid-proof
 2020-02-01 01:44:54 +01:00
Ghom
327bfcac2f Merge pull request #10786 from Commandersand/frick 
made the centcomm suit syndies order be a variant with no sensors
 2020-02-01 01:42:55 +01:00
Ghom
1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix 
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
 2020-02-01 01:41:36 +01:00
YakumoChen
74fd722871 Update ring.dm 2020-02-01 00:28:04 +00:00
YakumoChen
0020977891 this line ending shit is legitimate cancer 2020-01-31 19:05:23 -05:00
YakumoChen
c120221234 Update ring.dm 2020-01-31 23:13:58 +00:00
Ghommie
af9060cc15 clown ops uplink consistency. 2020-02-01 00:03:58 +01:00
YakumoChen
35e16c5cd5 Update ring.dm 2020-01-31 22:58:05 +00:00
YakumoChen
6d44e59497 Update ring.dm 2020-01-31 22:56:34 +00:00