shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,542 Commits 5 Branches 0 Tags
9609eb64e015e44a3dc0cacd4e32026b3f04494f
Commit Graph

18982 Commits

Author SHA1 Message Date
keronshb
9609eb64e0 Fixes some files and pathings for this 
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
 2020-02-09 15:18:15 -05:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof 
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
 2020-02-05 18:28:00 -05:00
Ghom
5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
Ghom
40f7a72e3c Update slippery.dm 2020-02-03 20:32:50 +01:00
Ghom
3cb1a0e9c8 Update slippery.dm 2020-02-03 20:31:57 +01:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538 
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
 2020-02-02 16:31:59 -07:00
kevinz000
c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546 
Something about runtime errors.
 2020-02-02 16:31:15 -07:00
kevinz000
341430eab5 Merge pull request #10836 from Hatterhat/rcd-carts-engifab 
adding stuff to techfabs - RCD carts, combifans
 2020-02-02 16:30:59 -07:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
Ghom
97be223b0b Merge pull request #10799 from Seris02/goldentoolboxfix 
makes the golden ""plastitanium"" toolbox actually plastitanium
 2020-02-02 19:08:16 +01:00
Ghom
8a81ba9efe Ok here we go. 2020-02-02 18:40:06 +01:00
Ghom
ee533da3d7 Putting GLOB.blood_reagent_types at use. 2020-02-02 18:34:14 +01:00
Ghom
96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks 
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
 2020-02-02 18:07:25 +01:00
Ghom
fb32b018ef Merge pull request #10838 from Owai-Seek/loadout 
Minor Loadout/Outfit Changes
 2020-02-02 18:07:00 +01:00
Ghom
bb1f65813e Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4 
Fixes APC ui_data runtime
 2020-02-02 18:06:44 +01:00
Artur
fe92573fc3 Forgot this 2020-02-02 13:44:44 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
66a2216ef3 Merge pull request #10829 from Ghommie/Ghommie-cit544 
Fixed and brutalized clown op slippery weapons a little.
 2020-02-02 03:16:23 -07:00
kevinz000
c94b5688db Merge pull request #10810 from YakumoChen/ring 
Adds ring jewelry
 2020-02-02 03:16:01 -07:00
kevinz000
e0f967eaa2 Update apc.dm 2020-02-02 02:57:14 -07:00
kevinz000
3812d2d9fa Merge pull request #10850 from Ghommie/Ghommie-cit548 
Fixes maploaded APC terminals direction.
 2020-02-02 02:54:53 -07:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
kevinz000
2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats 
polychromic winter coats
 2020-02-02 01:46:58 -07:00
kevinz000
88c20b1ea5 Merge pull request #10834 from Trilbyspaceclone/patch-273 
Craftable Crates!
 2020-02-02 01:43:32 -07:00
kevinz000
aaa7733cec Merge pull request #10820 from Ghommie/Ghommie-cit542 
clown ops uplink consistency.
 2020-02-02 01:39:31 -07:00
kevinz000
3fc832fbe7 Merge pull request #10819 from Ghommie/Ghommie-cit541 
clown ops infiltrator consistency.
 2020-02-02 01:39:08 -07:00
kevinz000
c9de66857e Merge pull request #10833 from Ghommie/Ghommie-cit545 
Playback device spam peeve.
 2020-02-02 01:38:52 -07:00
kevinz000
664c4cdea9 Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1 
Fixing chaplain armaments beacon edge case.
 2020-02-02 01:38:34 -07:00
kevinz000
e97af26236 ok ghom 2020-02-02 01:37:11 -07:00
kevinz000
38ec4f0e11 Update blood.dm 2020-02-02 01:35:38 -07:00
kevinz000
b59dd11adc Update blood.dm 2020-02-02 01:35:16 -07: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
Hatterhat
e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
Ghom
2bb0a0311a Merge pull request #10796 from Tupinambis/StatusBugFix 
Status Display Fix: It's About Time
 2020-02-02 01:51:07 +01:00
Ghom
d6c36f363e Merge pull request #10817 from IronEleven/ViroStatPort 
Updates Virus Symptom Stats to Match TG
 2020-02-02 01:41:11 +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
f6e30ee6aa Merge pull request #10841 from Kraseo/boxing 
Fixes being able to pull after wearing boxing gloves
 2020-02-01 19:13:30 +01:00
Ghom
d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines 
Moar engines!
 2020-02-01 19:11:10 +01:00
Kraseo
d70665a0c3 got asked to do this 2020-02-01 19:03:35 +01: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
Kraseo
aa2e4299e2 my grug brain took more than 10 attempts to get this to work 2020-02-01 18:51:18 +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
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