shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,526 Commits 5 Branches 0 Tags
e1cf63e0ac1663ffb3079581f2d3bc1491fe02f5
Commit Graph

110 Commits

Author SHA1 Message Date
Arturlang
f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Artur
1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Hatterhat
76e789d3d1 getting limb crippled is a 4head bruh 2019-12-31 00:14:52 -06:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam3145
b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Putnam3145
f33d4b3d18 Merge pull request #10108 from DeltaFire15/cbt-critical-fix 
Screaming no longer is a viable strategy against clockies
 2019-12-09 13:07:02 -08:00
DeltaFire
c0433ec944 I scream 
why can't I read
 2019-12-08 04:25:37 +01:00
DeltaFire
59e97989c0 I scream 
Hnnnnngh
 2019-12-08 04:20:04 +01:00
DeltaFire
88acc15fe5 scream if you want, it won't help you. 
Removes oxydamage from the "did you take damage" calculation for stuntime reduction
 2019-12-08 03:46:55 +01:00
Artur
4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Artur
19ab4a5f70 Review fixes and tweaks 2019-12-07 00:43:02 +02:00
Artur
82d1497ddc Fixes bad buds and toxin healing 2019-12-05 17:29:00 +02:00
Linzolle
ce04739ccb neck slice 2019-12-01 15:53:40 -06:00
Ghommie
e6484a22a8 Ports tgstation loom changes, and durathred golems. 2019-11-29 05:34:17 +01:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
DeltaFire15
9f8547d42d Another sync (#4) 
AAAAAAAAA
 2019-11-16 16:12:12 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
deathride58
60f5aec146 brings down the stamloss over time because holy fuck was it strong 2019-10-15 04:03:47 -04:00
deathride58
50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
kevinz000
4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205 
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured
 2019-10-13 14:00:52 -07:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
Ghommie
f449849bca if 2019-09-22 19:06:34 +02:00
Ghommie
fc933ab7bb setting durations. 2019-09-22 19:05:55 +02:00
Ghommie
3d0cb39e91 Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured. 2019-09-22 18:42:47 +02:00
skoglol
c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
chefferz
0f4f20c29a Update buffs.dm 2019-08-23 03:50:28 -04:00
chefferz
bd1dae9082 Update buffs.dm 2019-08-23 03:46:13 -04:00
chefferz
580ea38199 Update buffs.dm 2019-08-23 03:45:44 -04:00
Fermi
fdba8c000f Fixing compiling errors. 2019-06-23 20:03:37 +01:00
Fermi
b309490190 Forgot to ctrl+s 2019-06-23 19:02:53 +01:00
Fermi
8992dbfa4d Commented out hypnoquirk and edited it so that it functions differently 2019-06-23 18:59:15 +01:00
Fermi
4526832e7d I'm spending too much time trying to fix something rejected. 2019-06-17 15:16:45 +01:00
Fermi
59469fae2e Oops. 2019-06-17 12:40:30 +01:00
Thalpy
fb70b97d5b Tweaks hypnoquirk as the discord seems to really want it. 2019-06-16 20:24:36 +01:00
Fermi
7a66039f0c Fixing merge errors. 
Testmerge ready.
 2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Thalpy
6117e3a6aa Fixes to the hypnoflash, 2019-05-29 19:09:40 +01:00
Fermi
a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Ghom
a4c0a4e4be Clockwork kindle stun now respects the owner's remaining health (#7999) 
* clock slab OP pls nerf

* I'll go check if this can actually do later.

* In a clunky motion, it rails back onto the tracks.
 2019-02-22 05:58:52 -08:00
Coolgat3
f7b1304d57 Fixes clockcult to be actually playable on citadel. (#7982) 
* Some fixes

* Buffed vanguard to grant infinite stamina to actually make you immune to stuns

* Fixed the comment to not say infinite stun immunity cause that looked scary and bugged me lmao

* Revert "Buffed vanguard, infinite stam"

This reverts commit 8290e5bc4050f7c6476cde3dafb327bf93d49ef3 and
105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Revert "Buffed vanguard to grant infinite stamina to actually make you immune to stuns"

This reverts commit 105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Fixed vanguard and trying to fix reebe getting the reebe ztrait

* Git is hard. Fix.

* Vanguard buffs

* Git ate the credits
 2019-02-13 20:47:57 -08:00