147 Commits
Author SHA1 Message Date
SandPoot 141d783708 not a projectile!! 2024-04-01 21:13:35 -03:00
SandPoot 2518dd9fac go 2024-03-30 18:03:05 -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 b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
LinandGitHub fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
keronshb 4cb198fe05 Fixes Hitby runtime 2021-09-11 17:38:32 -04:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
siliconsandGitHub 5601badbff deterministic explosion system (#13392)
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
2021-05-12 05:44:53 -05:00
Putnam 4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
Dan-Neposh f96c6bc728 Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2 2021-03-15 16:33:38 -04:00
791d8f133d Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-15 16:43:23 -04:00
Dan-Neposh 39c9da93c9 deletes an unneeded space 2021-03-15 16:17:44 -04:00
Dan-Neposh e29606e5f3 addresses code suggestions from Deltafire 2021-03-07 20:47:07 -05:00
63d21d151c Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-07 02:13:03 -05:00
9787c02258 Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-07 02:06:18 -05:00
Dan-Neposh fb75c6a949 adds in ending sequence for Ratvar spawning, + various other changes
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
2021-01-22 00:04:04 -05:00
DeltaFire 154ccd5421 adds effects to corruption
Every ten seconds or so, while being above the low threshhold for corruption, you roll a prob(corruption) roll. If it goes through, you get affected by one of various effects depending on how corrupt your system is, from just getting a message and healing a bit of corruption, over getting halluscinations / getting muted for a bit, to getting forcefully sleeped after a 6-10 second warning
2020-11-01 21:47:38 +01:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01: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
silicons 67b518bf42 experimental 2020-07-27 13:09:54 -07:00
silicons 349874e512 haha 2020-07-26 16:49:47 -07:00
timothyteakettle 3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
silicons 64de8f16a9 fixes 2020-07-23 16:59:27 -07:00
silicons b20e3bc2b6 monkey attacks 2020-07-23 16:30:27 -07:00
silicons 29a8c2eee6 flushed 2020-07-23 12:47:21 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons 9a5e53a21f ok 2020-07-21 11:57:47 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy Teakettle ca6b289da6 fix tables and some minor thing 2020-07-19 17:49:22 +01:00
Timothy TeakettleandGitHub 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie 48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie 29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
Timothy Teakettle f054ae6288 appease our great linter overlord 2020-06-16 21:40:50 +01:00
Timothy Teakettle eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Ghommie c246e13693 Ok. 2020-06-08 19:15:51 +02:00
Ghommie ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
kevinz000 bad809ffce fixes 2020-06-04 19:56:06 -07:00
kevinz000 92a537da63 Damage fix 2020-05-29 19:12:46 -07:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
kevinz000 95c6c7345c implementations 2020-05-24 14:56:01 -07:00
GhomandGitHub 9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268)
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
2020-05-18 04:46:57 -07:00