Commit Graph

85 Commits

Author SHA1 Message Date
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
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
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
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
Jordan Brown 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -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
iksyp 496f73bc56 implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo (#36855)
* loyality

*fixed a bug that made coding relating to loyalty implants basically impossible

* did i say loyalty i meant mindshield

* and the .dme as well

this commit and last were webeditor but it should work
2018-04-02 19:46:01 -05:00
vuonojenmustaturska adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-28 12:17:32 -05:00
kevinz000 0e4f0c0211 Exploit 2018-03-13 23:04:15 -05:00
vuonojenmustaturska f3ad4b932d Implants that grant spells to their owners, for adminbus (#36116)
* badmin implants

* honk
2018-03-04 15:43:37 -06:00
kevinz000 0e22fe7660 Chem implants can no longer be activated by action button (#36087) 2018-03-03 06:12:06 -06:00
CitadelStationBot 1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
deathride58 05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552
[MIRROR] [s]Fixes writing bugs/exploits
2018-02-16 01:32:23 +00:00
deathride58 3dac047801 Update implanter.dm 2018-02-15 20:09:30 -05:00
ShizCalev 98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
KorPhaeron 0ed0abbd4c Slime Radio Potion (#35548)
* Slime Radio Potion

* Deletes inaccurate comment
2018-02-15 10:38:59 -06:00
KorPhaeron e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-11 05:13:46 -06:00
Jordan Brown fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
coiax 481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
ShizCalev 68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
JJRcop ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
coiax 866318e33e Internal radio implant 2017-12-29 02:52:24 -06:00