cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-29 07:36:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
95 Commits
Author SHA1 Message Date
Mosley 106d5b3c1e Merge remote-tracking branch 'upstream/master' 2024-08-25 12:48:45 -05:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
Mosley fdd494c1cf Merge remote-tracking branch 'upstream/master' 2024-08-18 15:49:07 -05:00
SandPoot d3a256f1de push 2024-08-11 04:12:13 -03:00
BongaTheProto 1e1fc329f8 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-13 14:12:39 -05:00
SandPoot 91045350e5 overlay stuff 2024-04-12 22:01:03 -03:00
Ayy-RoboticsandGitHub d767114e20 Update bitfields.dm with Cultmagic Bypass 2024-02-19 00:59:27 -05:00
WoolyAypa f70e1e901e Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-03-24 23:46:54 -03:00
Timothy TeakettleandGitHub 71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips 
Contextual screentips -- Screentips now show you what items/objects can do
 2023-02-15 23:04:54 +00:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
SandPoot 854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
WoolyAypa dcb7c6729c here! :> 2022-12-31 03:14:51 -03:00
WoolyAypa b1c288d267 help! 2022-12-12 12:38:18 -03:00
SandPoot b1f10e164e bitfields 2022-07-31 04:49:25 -03:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05: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
SandPoot 45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
DeltaFire 5d6978bb2f oh god oh fuck 2021-11-04 21:06:42 +01:00
keronshb 7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
Linzolle 46833abf0b add cult_permitted area flag 2021-05-27 19:34:00 -05:00
siliconsandGitHub 0534f70ccd Update bitfields.dm (#14645) 2021-04-24 21:29:53 +02:00
Letter NandGitHub 88ba15d748 Update bitfields.dm 2021-04-16 21:34:07 +08:00
necromanceranne 79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. 2021-03-25 09:07:52 +11:00
DeltaFireandGitHub 65c14cf289 Merge pull request #13537 from silicons/permissions 
support update for event manager permissions
 2020-12-22 16:12:03 +01:00
silicons 8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
silicons 3505a5bc18 fixes 2020-09-20 02:10:54 -07:00
silicons 8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
Timothy Teakettle eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
kevinz000 8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -07:00
kevinz000 180b7d31d9 sigh 2020-06-13 09:24:22 -07:00
kevinz000 433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
GhomandGitHub 968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
GhomandGitHub 12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
kevinz000 f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
Ghommie cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
kevinz000andGitHub f99d904dc7 ports /tg/station vis_flags related fixes (#12064) 
* fixes

* Update layers_planes.dm

* kay
 2020-05-01 21:14:04 +02:00
GhomandGitHub f37cfd5e98 Update bitfields.dm 2020-04-21 20:00:41 +02:00
Ghommie 5a4fecdeb8 tested and it works now, I'm glad. 2020-04-20 19:22:42 +02:00
kevinz000andGitHub e533103ed2 Merge branch 'master' into shield_bashing 2020-04-15 19:34:08 -07:00
kevinz000 f3537f38e6 shield bashing 2020-04-11 07:09:50 -07:00
kevinz000 f8a7a68ac3 lmao 2020-04-11 05:52:37 -07:00
kevinz000 f652a612e5 missing comma 2020-04-10 22:18:53 -07:00
kevinz000 3788496204 multiline support 2020-04-10 12:42:50 -07:00
kevinz000GitHubGhom
 		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
kevinz000 34fbcd1dc0 fixes 2020-02-19 07:49:05 -07:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghommie 02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00