shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,033 Commits 5 Branches 0 Tags
41f02fa24db0e6486d68e1881549f2ef49d6400a
Commit Graph

30033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000
41f02fa24d Update capture_the_flag.dm 2020-02-12 00:26:58 -07:00
CitadelStationBot
60756cbc35 Automatic changelog generation for PR #11003 [ci skip] 2020-02-11 09:11:14 -06:00
Ghom
ac64f6574c Merge pull request #11003 from kevinz000/meme_rifles 
Fixes energy lens not being in gun contents
 2020-02-11 16:11:11 +01:00
CitadelStationBot
d05624dbec Automatic changelog generation for PR #10996 [ci skip] 2020-02-11 02:34:07 -06:00
Ghom
5726f041a8 Merge pull request #10996 from PersianXerxes/gulagChanges 
Separates gulag and public mining, removes sec vendor from gulag
 2020-02-11 09:34:04 +01:00
kevinz000
58db43621d Merge pull request #10941 from Ghommie/Ghommie-cit561 
Adds the ELEMENT_DETACH flag to two elements
 2020-02-11 00:42:15 -07:00
CitadelStationBot
5e342a6f56 Automatic changelog generation for PR #10961 [ci skip] 2020-02-10 14:29:00 -06:00
Lin
4797b5edc8 Merge pull request #10961 from Citadel-Station-13/Ghommie-patch-2-1 
Fixes an issue with the nearsighted prescription glasses taking over worn eyewear
 2020-02-10 20:28:57 +00:00
CitadelStationBot
2d9e1d2ea3 Automatic changelog generation for PR #10989 [ci skip] 2020-02-10 14:27:41 -06:00
Lin
f1f8123e5a Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5 
CallMaterialName reagent fix
 2020-02-10 20:27:38 +00:00
Lin
4f546c90e3 Merge pull request #10982 from Ghommie/Ghommie-cit566 
something about suit_digi.dmi
 2020-02-10 20:24:35 +00:00
Ghom
c8a62e7acf Merge pull request #10985 from r4d6/Dwarf 
Dwarven Update
 2020-02-10 12:23:23 +01:00
CitadelStationBot
24ea1aa393 Automatic changelog generation for PR #11001 [ci skip] 2020-02-10 05:22:43 -06:00
Ghom
3ee4f25626 Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes 
Pandemic Fixes
 2020-02-10 12:22:40 +01:00
CitadelStationBot
289ad5d3cb Automatic changelog generation for PR #11000 [ci skip] 2020-02-10 05:20:42 -06:00
Ghom
a0666e7454 Merge pull request #11000 from Seris02/rcdfixyeet 
makes RCDs not cost a single sheet of glass and metal
 2020-02-10 12:20:40 +01:00
CitadelStationBot
0a04d0ab49 Automatic changelog generation for PR #10596 [ci skip] 2020-02-10 05:16:17 -06:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup 
Hijack Implant
 2020-02-10 04:16:14 -07:00
CitadelStationBot
754ee3d990 Automatic changelog generation for PR #10967 [ci skip] 2020-02-10 05:15:32 -06:00
kevinz000
79146bce9b Merge pull request #10967 from Citadel-Station-13/Ghommie-patch-3 
Fixes AI unanchoring not properly removing the no teleport trait.
 2020-02-10 04:15:29 -07:00
CitadelStationBot
0cfcf99e45 Automatic changelog generation for PR #10988 [ci skip] 2020-02-10 05:14:37 -06:00
kevinz000
c9e5fd1c17 Merge pull request #10988 from YakumoChen/master 
Reverts 10486 (Observe verb in the Ghost tab)
 2020-02-10 04:14:33 -07:00
CitadelStationBot
e046694f2b Automatic changelog generation for PR #10971 [ci skip] 2020-02-10 05:14:21 -06:00
kevinz000
5d2b2d7fbf Merge pull request #10971 from Trilbyspaceclone/disco_baby 
Adds more Alien disco
 2020-02-10 04:14:18 -07:00
kevinz000
4416d9de46 Merge pull request #10965 from Citadel-Station-13/Ghommie-patch-2 
Fixing the mob holder element
 2020-02-10 04:11:51 -07:00
CitadelStationBot
1bef9fa67b Automatic changelog generation for PR #10948 [ci skip] 2020-02-10 05:11:38 -06: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
CitadelStationBot
82eeec99bb Automatic changelog generation for PR #10976 [ci skip] 2020-02-10 05:09:21 -06:00
kevinz000
88fa342c26 Merge pull request #10976 from Ghommie/Ghommie-cit565 
fixing another issue with the hear component signal.
 2020-02-10 04:09:19 -07:00
kevinz000
45bec21520 fix sync 2020-02-10 04:01:21 -07:00
Artur
816f94bd61 pandemic fixes 2020-02-10 10:20:57 +02:00
Seris02
e6aa47997c fix rcd cost 2020-02-10 16:00:21 +08:00
CitadelStationBot
4e45525a26 Automatic changelog generation for PR #10926 [ci skip] 2020-02-10 01:40:13 -06:00
Ghom
0d37700836 Merge pull request #10926 from keronshb/PirateBombProof 
Buffs the Pirate Ship to be bomb resistant
 2020-02-10 08:40:10 +01:00
Ghom
bd5f2bd64d Update reinf_walls.dm 2020-02-10 07:41:36 +01:00
keronshb
023d49a207 30 removal 
Here it is
 2020-02-09 23:44:34 -05:00
CitadelStationBot
feadfae8f6 Automatic changelog generation for PR #10984 [ci skip] 2020-02-09 20:51:52 -06:00
Ghom
96a240bc11 Merge pull request #10984 from Trilbyspaceclone/patch-277 
Makes heads of staff no longer come to work as a gang leader
 2020-02-10 03:51:49 +01:00
Persi
4c2359de3b Separates gulag and public mining, removes sec vendor from gulag 2020-02-09 21:45:57 -05:00
keronshb
1492586f76 Fixes round 3? 4? 
Should fix the last round of requests?
 2020-02-09 18:18:55 -05:00
CitadelStationBot
caf229b354 Automatic changelog generation for PR #10981 [ci skip] 2020-02-09 16:56:55 -06:00
Ghom
33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange 
Nerfing Stimulants
 2020-02-09 23:56:52 +01:00
keronshb
60a3b134a3 Should fix the rest of the requested changes 
Title
 2020-02-09 17:30:22 -05:00
CitadelStationBot
4bc5ea60b5 Automatic changelog generation for PR #10937 [ci skip] 2020-02-09 15:49:24 -06:00
Ghom
c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates 
Updates the debug outfit
 2020-02-09 22:49:22 +01:00
CitadelStationBot
4e4346b8d4 Automatic changelog generation for PR #10277 [ci skip] 2020-02-09 14:47:34 -06:00
Ghom
c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit 
ENDS THE PLUSHIE DRAMA
 2020-02-09 21:47:30 +01:00
CitadelStationBot
9ee5a84ad6 Automatic changelog generation for PR #10936 [ci skip] 2020-02-09 14:38:53 -06:00
Ghom
0f2f5ab639 Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7 
Cyborging someone will now be able to force-remove gang lead status, much like how it can force-deantag headrevs and bloodsuckers
 2020-02-09 21:38:50 +01:00
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