139 Commits
Author SHA1 Message Date
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
SandPoot f93ee9feea turrets 2022-07-31 05:06:01 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
ArturandArtur 30016f38a8 compiles 2021-07-28 02:13:57 +03:00
LinandGitHub 5f312363e3 Merge pull request #14909 from DeltaFire15/slimepuddle-why
Changes turrets back to check for stamcrit instead of mobility_use
2021-07-02 00:51:18 -07:00
DeltaFire 3874d9d49d mobility moment 2021-07-01 02:24:37 +02:00
Putnam3145 c06983ce09 uh... does this? 2021-06-21 09:27:32 -07:00
Putnam3145 0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Artur f2343b32fe Brings back turret fixing 2021-01-28 09:39:21 +02:00
shellspeed1 b69132bede ports https://github.com/tgstation/tgstation/pull/52931 2020-12-31 00:34:44 -08:00
siliconsandGitHub 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
timothyteakettle 04a7c66561 fix turret removal 2020-09-26 01:38:04 +01:00
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Letter N 2615506ae9 oops, forgot about this 2020-08-09 13:18:10 +08:00
Letter N 4bed3a5349 OH FUCK 2020-08-09 12:49:14 +08:00
Letter N 5abcc1c220 reverts this change 2020-08-09 12:00:12 +08:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
siliconsandGitHub 3b1826ce82 Update portable_turret.dm 2020-08-03 18:29:11 -07:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
LinandGitHub bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
LinandGitHub 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
siliconsandGitHub d52892f000 Update portable_turret.dm 2020-07-26 16:32:20 -07:00
siliconsandGitHub d954588c9a Update portable_turret.dm 2020-07-26 16:30:50 -07:00
Letter N 22d5aebaa5 second batch - MAJOR: mech_fab, turrets 2020-07-24 14:38:04 +08:00
silicons 08f905f5bc Update portable_turret_construct.dm 2020-07-23 18:52:27 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
kevinz000 1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
GhomandGitHub a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
kevinz000 05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
GhomandGitHub ce1f1bdf5e Turning a few components into elements. (#12325)
* Turning a few components into elements.

* eh
2020-05-24 13:06:27 -07:00
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
necromanceranne fc2b6a9a81 fixes turrets 2020-03-17 03:57:35 +11:00
Ghommie 60c7268e37 Also fixing bloodsucker coffins. 2020-03-04 16:29:09 +01:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000andGitHub c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
2020-02-10 04:16:14 -07:00
keronshb 1492586f76 Fixes round 3? 4?
Should fix the last round of requests?
2020-02-09 18:18:55 -05:00