Commit Graph

107 Commits

Author SHA1 Message Date
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Artur 488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Ghommie d9636398e1 Fixes implant pads 2019-11-29 20:12:10 +01:00
kevinz000 dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00
Ghommie 91625b6e60 item/doMove() calling dropped() callign qdel(src) because of DROPDEL. 2019-11-02 14:15:31 +01:00
Ghommie 874cdfefb8 fixing storage implant transplant. 2019-11-02 14:03:14 +01:00
Ghommie b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie 7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
Ghommie b95f910a4e macros 2019-10-07 17:32:16 +02:00
Ghommie 5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00
Ghommie 32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
kevinz000 a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
TrilbySpaceClone 7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
YakumoChen 06d9dd8a52 !
Box no longer a damage sponge, deletes in one hit
2019-07-26 23:55:43 +00:00
Ghommie fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
kevinz000 8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
kevinz000 2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
deathride58 8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
2019-06-08 01:07:56 -04:00
Ghommie 7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02: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
kevinz000 8cd0b69b61 adrenals 2019-05-28 01:00:41 -07:00
JTGSZ 080b29de79 Solves a few things. 2019-05-23 00:40:57 -04:00
Ghommie 2b668a8b7c activated = FALSE 2019-05-21 23:12:23 +02:00
Ghommie ab9bde1b15 reverts Lily. 2019-05-21 22:55:49 +02:00
Ghommie 20124c24ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-05-21 22:48:59 +02:00
Ghommie 5e4bbb0d02 Awaken, code. 2019-05-21 22:45:59 +02:00
kevinz000 55dca0bd41 Merge pull request #8139 from Trilbyspaceclone/patch-82
Makes mind shields bomb proof
2019-05-21 00:00:28 -07:00
Useroth 5d8cf0cabe Let's give adrenals the one more small touch of love. 2019-04-28 16:13:07 +02:00
Useroth 8ab82e0853 Fixed two leftovers from a feature that I will do in another PR. 2019-04-28 06:23:36 +02:00
Useroth 56b2e7150c Back to the point of entry. 2019-04-28 06:21:03 +02:00
Useroth 41a8177f34 Adjustments v2. 2019-04-27 13:53:04 +02:00
Useroth c1ffffa4f1 Adjustments. 2019-04-27 13:50:23 +02:00
Useroth 9c17845e0f Buffed changeling adrenals too. 2019-04-26 21:34:50 +02:00
Useroth 3563fef4c0 Makes adrenals work pretty much like they used to pre combat rework. 2019-04-26 16:47:31 +02:00
Ghommie ced2ee0ad0 Painbow extract. Cluwne. 2019-03-19 14:48:35 +01:00
Ghommie a537c12757 Apply some pressure, you lose some pressure 2019-03-19 12:29:26 +01:00
Trilbyspaceclone d33b57031f Update implant_mindshield.dm 2019-03-18 21:00:50 -04:00
kevinz000 47d0cc7b1b Update implant_mindshield.dm 2019-01-04 22:02:22 -08: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 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
deathride58 e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00