shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,200 Commits 5 Branches 0 Tags
cede93299edeca080bcff09a0a7d0d0b028f1e02
Commit Graph

164 Commits

Author SHA1 Message Date
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
kevinz000
123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
Poojawa
dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Ghommie
12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168 
Fixes and standarizes sword sheaths/scabbards overlays.
 2019-08-05 00:49:49 -07:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
06271dfcff aching special case. 2019-07-31 03:12:09 +02:00
Ghommie
991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
Ghommie
2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
Ghommie
6c712a6931 Implementing nerfs. 2019-07-24 17:58:24 +02:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
kevinz000
a573689101 Merge pull request #8887 from Poojawa/last-word-hearing-psychics 
Gang victory news report and last words for discord bot
 2019-07-14 14:04:20 -07:00
Thalpy
f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01:00
Poojawa
4d895ae6c0 Gang victory news report and last words for discord bot 
also slight improvement to gangster greetings
 2019-07-13 08:38:19 -05:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
31bd9104bb Ports "Adds blueshirt items to sectech and defines them better." 2019-07-13 06:42:09 +02:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
kevinz000
a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79 
Ports "Removes SSreligion"
 2019-06-28 20:30:44 -07:00
Fermi
3ccf300052 Fixed empty hypovial 2019-06-25 23:11:43 +01:00
Fermi
3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01:00
Ghommie
67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
Ghommie
38bc8a4efd Ports "Removes SSreligion" 2019-06-23 01:45:21 +02:00
Ghommie
44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +02:00
Ghommie
480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00
Trilbyspaceclone
b1439ecdb9 Update gang_items.dm 2019-06-08 11:09:18 -04:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs 
Ports gang mode
 2019-06-05 01:55:19 -07:00
Poojawa
1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
JTGSZ
93813613aa Some changes. 2019-05-27 14:42:07 -04:00
JTGSZ
38ad6785a0 Over-reduced the item costs a bit too much. 
Lets do it in tiny increments until It plays somewhat unpredictably for all sides.
 2019-05-23 01:42:00 -04:00
JTGSZ
080b29de79 Solves a few things. 2019-05-23 00:40:57 -04:00
Ghommie
4998b7cfa1 Actually, the cult team should process it instead. 
Got you covered, badmins spawning cult on other modes.
 2019-05-22 18:43:26 +02:00
Poojawa
971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Ghommie
6bb70297ec Why did you check if the gamemode's type is an antagonist datum? 
And why did it sort of work too?
I don't understand.
Pooj's copypasting this black magic, smh.
 2019-05-22 06:09:18 +02:00
JTGSZ
84016ed3ef Here we go. 2019-05-21 12:30:44 -04:00
deathride58
d40d9791c4 Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41 
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
 2019-05-21 08:06:21 -04:00
kevinz000
a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker 
[Ready]Makes a blue space bike horn HONK
 2019-05-20 23:40:17 -07:00
JTGSZ
03f129fa6e More changes 2019-05-19 07:29:09 -04:00
JTGSZ
09dfb448ed woops 
left that at 1 instead of 15
 2019-05-18 05:51:53 -04:00
JTGSZ
6c077758c6 ports gang 2019-05-18 05:06:22 -04:00
deathride58
50bdbcc46f Merge branch 'master' into kevinz000-patch-41 2019-05-17 00:29:31 -04:00
deathride58
ba125a2648 Merge pull request #8270 from Citadel-Station-13/kevinz000-patch-40 
makes Eutactic (so the other energy sword) swords not strictly crappier than normal swords, makes combining them possible and makes the hyper-eutactic blade not strictly crappier than the desword
 2019-05-17 00:14:36 -04:00
kevinz000
7c1d7b60d0 Merge pull request #8287 from Trilbyspaceclone/Lock_and_key 
Lockable Collars - Requested by Frack
 2019-04-30 05:18:14 -07:00
Trilbyspaceclone
59cc2b5a9c Update vending.dm 2019-04-25 20:42:38 -04:00
kevinz000
4190a00693 Update eutactic_blades.dm 2019-04-20 19:37:54 -07:00