shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,116 Commits 5 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

132 Commits

Author SHA1 Message Date
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
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
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
kevinz000
b1d358ed79 Update eutactic_blades.dm 2019-04-20 19:26:53 -07:00
kevinz000
22f72c6431 Update eutactic_blades.dm 2019-04-20 19:23:10 -07:00
Poojawa
30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
Trilbyspaceclone
dcfbcbae6d woops forgot the moodlit 2019-03-28 19:49:50 -04:00
Trilbyspaceclone
2ecc532c48 Update honk.dm 2019-03-28 19:40:28 -04:00
kevinz000
56b1857e30 Merge pull request #8118 from deathride58/PROPERFUCKINGDNRS 
makes the DNR status affect ghost role (event and spawner roles) eligibility, makes cryopods always apply DNR status, and readds suicide + ghost admin logging
 2019-03-22 19:14:07 -07:00
deathride58
e4c5f005a0 makes DNR apply properly to ghost roles and midround antags 2019-03-15 16:26:17 -04:00
Ragolution
890a23df52 Github client is shit. 
Ooga
 2019-03-14 00:16:11 -04:00
Ragolution
8cc589b069 Actually fixes the thing. 
Turns out this was 100% easier to fix than I thought.
 2019-03-14 00:03:37 -04:00
Ghom
704d7403ac Tweaking some cyborg mounted energy guns. (#8037) 
* You get yourself a bottle and say, "I don't love anything anymore."

* the sunset.

* I'm nuclear gun, I'm wild.
 2019-02-27 16:02:33 -08:00
LetterJay
0015e806ab donation item 2019-01-13 02:36:15 -06:00
Poojawa
d429eb67cd remodularize vtec code 
Works as expected now but, combat rework meme jog/spring override speeds
 2018-10-20 07:19:19 -05:00
Poojawa
1d6355534c Unmodularizes vtech controls 
I swear most of this shit just doesn't work in modularization anymore.
 2018-10-20 04:18:09 -05:00
Poojawa
f34d94cd4d pretty much all modular code seems to turbo break 2018-10-13 00:39:28 -05:00
deathride58
212187620b Merge pull request #7599 from Poojawa/override-override 
Digitigrade Uniforms from Oracle
 2018-09-29 21:30:12 -04:00
Poojawa
f2faf66586 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning 2018-09-28 22:09:19 -05:00
Poojawa
2daa197605 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override 2018-09-27 05:09:23 -05:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
izzyinbox
9a98b92c58 fixes tennis ball equip slots (#7582) 2018-09-26 12:16:13 -07:00
Poojawa
4efdf4b0b3 Cleans up Modular_citadel 
Yes I know it'll have merge conflicts later.
 2018-09-21 03:52:13 -05:00
Poojawa
7d300117af literally everything Bhjin has been complaining about 
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
 2018-09-18 03:59:46 -05:00
Poojawa
dc9fd6db12 readds V-tech control, modularized properly 2018-09-17 22:35:43 -05:00
Poojawa
90ec68f095 Fixes cryopod control setting 2018-09-16 07:27:40 -05:00
deathride58
4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) 2018-08-03 19:29:19 -07:00
Bear
586d3a3456 super minor fix 2018-07-18 01:22:56 -04:00
Trilbyspaceclone
c0bd256178 Makes revs have a min pop needed 
Needs 20 players min to make sure there is a Head and at lest one sec officer more then likely
 2018-07-13 11:32:47 -04:00
deathride58
1145a66ec3 Merge pull request #7345 from LetterN/patch-5 
adds plushnar and plushvar on chapvendors
 2018-07-10 02:01:21 -04:00
Letter N
c258941098 Update vending.dm 2018-07-06 17:26:55 +08:00
Letter N
5c79a794ec Update holy_weapons.dm 2018-07-06 17:20:30 +08:00
Letter N
bff55cc362 Update handcuffs.dm 2018-07-06 17:19:56 +08:00
deathride58
cec2871db2 Merge pull request #7293 from LetterN/patch-4 
fixes kinkmate
 2018-07-06 01:36:15 -04:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00