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
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
Ghommie
ad7101d0aa
ports anti-magic component code updates (holymelon not included).
2019-10-25 03:20:42 +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
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
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
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
Poojawa
b6430559e9
datums
2018-09-11 02:49:41 -05:00
Poojawa
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines ( #6004 )
...
* Replaced body zone magic strings with defines
* merge conflicts
2018-03-19 21:18:57 -05:00
XDTM
493623c827
Refactors anti-magic into a component
2018-02-25 14:45:51 -06:00
Poojawa
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
oranges
3208404f14
Merge pull request #33580 from Xhuis/defenses_balancing
...
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
kevinz000
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
oranges
51b8f45345
Merge pull request #30802 from CPTANT/Stamina_regen_2
...
Stamina regen light
2017-09-20 03:52:59 -05:00
CitadelStationBot
b753909958
Cult ghosts can no longer be potentially deconverted or debrained
2017-08-29 10:25:31 -05:00
CitadelStationBot
4c4bd22578
[MIRROR] Some more tweaks to Geis ( #2487 )
...
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
2017-08-27 01:36:17 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
4796ede787
Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 10:15:09 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
8627946f72
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once ( #1753 )
2017-06-30 21:22:45 -07:00
