shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

299 Commits

Author SHA1 Message Date
necromanceranne
5c2e244ee0 Ports /tg/ pr #44529, reverts #9092 2020-02-16 22:20:50 +11:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup 
Hijack Implant
 2020-02-10 04:16:14 -07:00
kevinz000
c3eaa0fcbd Merge pull request #10948 from Citadel-Station-13/Ghommie-patch-1 
Prevents certain unpurchasable discounts.
 2020-02-10 04:11:35 -07:00
Arturlang
29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves 
thief's gloves
 2020-02-06 23:53:54 -07:00
Ghom
fc1c97b6c6 [s] Prevents some unachievable discounts. 2020-02-07 06:11:20 +01:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Ghom
4cdade4b2d Merge pull request #10788 from Seris02/crushboots 
crushing magboots for tators
 2020-02-05 07:36:14 +01:00
Ghommie
81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +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
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01: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
Ghom
1745308cc5 Forgot about this. 2020-02-01 02:14:14 +01:00
Ghommie
af9060cc15 clown ops uplink consistency. 2020-02-01 00:03:58 +01:00
Seris02
81039b131b fixes 2020-01-31 09:49:08 +08:00
Seris02
a415dbf31b yas 2020-01-31 08:19:35 +08:00
Seris02
88e42b2e15 *crunch crunch stomp stomp* 2020-01-30 18:07:35 +08:00
Seris02
bf47daf099 MY PRECIOUS! GONE!! GOOOOOONE!!! 2020-01-30 17:00:14 +08:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Seris02
90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Seris02
a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Ghommie
2fe23b67db fug 2020-01-18 03:37:30 +01:00
Ghommie
224146ee1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444 2020-01-18 03:36:09 +01:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Seris02
10944719b1 erge branch 'master' of https://github.com/Citadel-Station-16/Citade-Station-18 into bowmanupgrade 
nope
 2020-01-13 11:50:39 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Seris02
b22ec2ffd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade 2020-01-12 11:14:33 +08:00
Seris02
3ce8d2a61c adds bopwmanizing 2020-01-11 17:33:44 +08:00
Trilbyspaceclone
05d86b7072 Update uplink_items.dm 2020-01-09 16:03:27 -05:00
Trilbyspaceclone
9ba5f35398 Update uplink_items.dm 2020-01-09 16:02:53 -05:00
TrilbySpaceClone
74d881388e so much cleaner 2020-01-09 15:42:09 -05:00
Ghom
12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head 
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
 2019-12-26 16:07:45 +01:00
Seris02
9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
Hatterhat
d1c96237a6 the very shitty idea: "muh speedloader" 2019-12-24 04:16:33 -06:00
Ghom
f30be0ace6 Merge pull request #10077 from ForrestWick/uplinkchanges 
Moves brainwash surgery from role restricted to devices and tools in the uplink
 2019-12-21 12:43:18 +01:00
Ghom
1748a5ee4b Merge pull request #10054 from kappa-sama/patch-10 
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
 2019-12-20 13:27:35 +01:00
nik707
63dd3487b3 Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed 
the one where the combat medic kit gets buffed
 2019-12-19 14:11:27 -06:00
Hatterhat
a1cc129d0b slightly better storage, cucks the surgery duffel 2019-12-13 21:10:12 -06:00
Seris02
31950c106f change cost to 18 tc 2019-12-10 12:07:33 +08:00
Ghommie
f83d1c4763 Made kevlar and armor padding accessories inconspicious and examine-proof. 2019-12-07 10:53:10 +01:00
kappa-sama
d78df2cc5d since they're gone from autos 2019-12-05 19:47:54 -05:00
ForrestWick
07a5b13abd Update uplink_items.dm 2019-11-29 16:45:17 -06:00
Ghommie
ee73806616 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352 2019-11-21 09:18:14 +01:00