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-20 11:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
133 Commits
Author SHA1 Message Date
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 2fa8d53b55 Merge remote-tracking branch 'upstream/master' 2023-01-20 13:18:03 -05:00
FelixRuinandGitHub 58090d704f Monophobia vore and blind fix (#289) 2023-01-19 21:54:08 -03:00
BongaTheProtoandGitHub 43829e47e4 Merge branch 'Sandstorm-Station:master' into master 2022-07-24 13:29:11 -05:00
SandPoot 8e71dbe371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 15:07:34 -03:00
SandPoot 329e160a1f /BiologicalLife(delta_time... 2022-07-20 21:40:53 -03:00
BongaTheProto ffec4796fd Stations update + portal panties fix (?) 
- Updates tau and smol
- fixes a supposed runtime with portal panties

We haven't had problems with them so far so I'm scared this may just fuck them up. Always worth the try though
 2022-04-26 23:12:03 -05:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot bf69229ada Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-16 17:18:56 -03:00
silicons ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
SandPoot 2c4fcaba81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-06 15:04:36 -03:00
DeltaFire cd570be827 woo 2021-10-04 15:03:56 +02:00
SandPoot e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03:00
Timothy Teakettle 1665a45a5e expunged 2021-09-17 16:26:22 +01:00
Timothy Teakettle e2df9fec47 indentation 2021-09-17 12:26:11 +01:00
Timothy Teakettle 1ab63a69c5 Update mild.dm 2021-09-17 12:17:53 +01:00
SandPoot 1c2b219938 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-15 15:52:18 -03:00
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
bunny232andGitHub 50cf7a85f8 Merge pull request #2 from Citadel-Station-13/master 
a
 2021-08-08 08:51:58 -04:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
bunny232 c7a7346939 monophobia nerf 2021-07-19 07:36:22 -04:00
SandPoot 0d1a6c73fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 23:31:15 -03:00
DrathekandGitHub 2aea4bd969 Fix dangling parentheses breaking regex in hypnotic stupor (#131) 
Added optional limits to how often a hypnotic stupor can apply a trance

(Cherry pick from [6f496bb] fixing config conflict with dogborg sleepers)
 2021-01-12 07:56:41 -03:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy TeakettleandGitHub 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000andGitHub 433b42957c Update severe.dm 2020-06-13 14:14:00 -07:00
kevinz000andGitHub db9a96a4ed webedit moment 2020-06-13 13:24:28 -07:00
kevinz000andGitHub 2544f6c5a4 Update severe.dm 2020-06-13 13:17:16 -07:00
Ghommie e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
GhomandGitHub 85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -07:00
GhomandGitHub ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
GhomandGitHub 08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282) 
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
 2020-05-17 17:04:15 -07:00
GhomandGitHub 7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00
Ghommie 2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
kevinz000andGitHub 8f29839dbf Runechat Port (#12065) 
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
 2020-05-03 03:53:19 +02:00
GhomandGitHub 09608dee5f Update split_personality.dm 2020-03-28 03:30:36 +01:00
GhomandGitHub 91aad127dd Quick webedit fixing an issue with the split personality. 2020-03-25 13:54:41 +01:00
Putnam3145andGitHub 368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549) 
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
 2020-03-22 13:02:23 +01:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
kevinz000 b5ca546ac3 patch 2020-01-20 22:45:21 -07:00
kevinz000 9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00