shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,352 Commits 5 Branches 0 Tags
4dcdf7ac4de4e184efefefd0aff9a07757c64296
Commit Graph

13965 Commits

Author SHA1 Message Date
kevinz000
4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock 
Adds the ability to construct and deconstruct locker locks
 2019-08-04 19:07:35 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
 2019-08-04 19:04:59 -07:00
Sishen
1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
kevinz000
f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun 
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
 2019-08-03 00:48:59 -07:00
kevinz000
eca34a6552 Merge pull request #8994 from Ghommie/Ghommie-cit164 
Makes staminaloss also apply the oxyloss fullscreen overlay.
 2019-08-02 01:43:46 -07:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting 
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
 2019-08-02 00:57:05 -07:00
kevinz000
5fdd0b82dd Merge pull request #9008 from Linzolle/kravmaga 
fix krav maga leg sweep
 2019-08-02 00:55:34 -07:00
kevinz000
eef733da3d Merge pull request #9026 from BurgerLUA/Alert-Level-Indicator 
Alert Level is now displayed at the job selection screen.
 2019-08-02 00:55:18 -07:00
kevinz000
dba6a25b15 Merge pull request #9011 from Trilbyspaceclone/patch-201 
Ports "Gauze can now be applied to corpses #44199"
 2019-08-02 00:54:57 -07:00
kevinz000
caa0579fca Merge pull request #9016 from Trilbyspaceclone/patch-204 
Fixes Pound and hardware cake
 2019-08-01 23:29:27 -07:00
kevinz000
b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun 
Makes a new traitor Emitter gun for Engi memes
 2019-08-01 23:29:10 -07:00
kevinz000
20f912df49 Merge pull request #8953 from Michiyamenotehifunana/Rapid-Resprite-Service 
Resprites RCDs and RPDs
 2019-08-01 23:28:21 -07:00
kevinz000
84a5c8fe5f Merge pull request #8988 from kiwedespars/hallucination-sting 
Hallucination Sting Buffs
 2019-08-01 23:26:37 -07:00
kevinz000
0a83649f28 Merge pull request #9000 from EgoSumStultus/shielf 
REMOVES SHIELF
 2019-08-01 23:25:52 -07:00
BurgerLua
c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua
3baac83021 Added 2019-07-31 16:40:35 -07:00
Ghommie
d9a09d7211 Undoes a few things. 2019-07-31 21:23:20 +02:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Trilbyspaceclone
c68fb90955 Update snacks_cake.dm 2019-07-31 12:03:56 -04:00
Trilbyspaceclone
bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
Linzolle
db198ba217 fix leg sweep 2019-07-31 01:17:12 -05:00
Chayse Ramsay
085251f5f7 update_icon 2019-07-30 04:35:54 +01:00
Michiyamenotehifunana
94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service 2019-07-29 21:15:46 +08:00
Trilbyspaceclone
57b6294310 Update uplink_items.dm 2019-07-29 07:54:17 -04:00
Trilbyspaceclone
969b928642 Update special.dm 2019-07-29 07:53:41 -04:00
Trilbyspaceclone
f9dfe5ae97 Update special.dm 2019-07-29 07:53:11 -04:00
kevinz000
e6fc288076 Merge pull request #8950 from Trilbyspaceclone/patch-195 
Ports "Fixes slime lungs runtime. #45057"
 2019-07-29 04:50:49 -07:00
kevinz000
e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix 
Mobs eaten by His Grace now require a mind attached to count for ascension
 2019-07-29 04:47:44 -07:00
kevinz000
0cda6cf8cf Merge pull request #8991 from Trilbyspaceclone/patch-200 
Ports "Fixes bloodchiller and ling tentacle. #45337" - Item storge fix
 2019-07-29 04:47:01 -07:00
kevinz000
25eba5829d Merge pull request #8980 from Ghommie/Ghommie-cit159 
Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles.
 2019-07-29 04:44:08 -07:00
kevinz000
2252b81798 Merge pull request #8964 from Trilbyspaceclone/patch-197 
Makes steal a few steal objectives better worded and role restricted better
 2019-07-29 04:42:20 -07:00
kevinz000
a0cf508d99 Merge pull request #8959 from Trilbyspaceclone/patch-196 
Ports "Anti-magic items now work properly in the suit storage slot #45333"
 2019-07-29 04:41:55 -07:00
kevinz000
3713533c18 Merge pull request #8983 from Ghommie/Ghommie-cit161 
One liner fix for the most useless feature of the year.
 2019-07-29 04:41:23 -07:00
kevinz000
a95fff589c Merge pull request #8966 from Poojawa/RLD-fix 
Gives RLD adaptive overlays, adds cable color to RCL sprites
 2019-07-29 04:41:07 -07:00
kevinz000
624d74f500 Merge pull request #8965 from Trilbyspaceclone/patch-198 
Ports "Security can access gulag equipment reclaimer #45298"
 2019-07-29 04:40:01 -07:00
kevinz000
26c195dec8 Merge pull request #8971 from Linzolle/toxiclover 
makes slimepeople like toxic food
 2019-07-29 04:39:12 -07:00
kevinz000
8477a524ae Merge pull request #8978 from YakumoChen/cardbored 
Removes stealth implant box integrity
 2019-07-29 04:38:42 -07:00
kevinz000
11628431b4 Merge pull request #8976 from Ghommie/Ghommie-cit157 
Fixes combatmode disarm pushing people on inaccessible tables and more.
 2019-07-29 04:38:14 -07:00
kevinz000
2c3e46bbb9 Merge pull request #8982 from Ghommie/Ghommie-cit160 
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
 2019-07-29 04:37:36 -07:00
kevinz000
156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162 
allows the captain sabre sheat to hold stunswords.
 2019-07-29 04:37:21 -07:00
kevinz000
32e8bfbea1 Merge pull request #8979 from Ghommie/Ghommie-cit158 
Fixes CHECK_BITFIELD macro.
 2019-07-29 04:33:21 -07:00
kevinz000
7b7f4f8042 Merge pull request #8795 from Sishen1542/emp-rebalance 
Buffs tracking beacon EMPs, and makes EMP damage temporarily disable mech equipment
 2019-07-29 04:32:51 -07:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
EgoSumStultus
1263918bd3 REMOVE SHIELF 2019-07-28 21:51:40 -07:00
deathride58
a373899ae0 [s] fixes major server crash exploit vector involving notes 2019-07-28 13:08:02 -04:00
Ghommie
6f33856ae7 Makes staminaloss also apply the oxyloss fullscreen overlay. 2019-07-28 18:51:19 +02:00
Trilbyspaceclone
ca2b4a8267 Update mutations.dm 2019-07-28 08:11:06 -04:00
Trilbyspaceclone
a2b35d71fa port-part1 2019-07-28 08:07:44 -04:00
EgoSumStultus
223aa33b07 mind check 2019-07-28 04:43:06 -07:00