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-24 05:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1798 Commits
Author SHA1 Message Date
SandPoot 66b05f5261 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-06 16:40:58 -03:00
SandPoot 8cfb7a1bf4 They no longer snap south! 2022-03-24 01:03:42 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot 11daaadf79 arguments. 2022-03-18 18:43:40 -03:00
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade 171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
BongaTheProto 7af61efa52 Merge remote-tracking branch 'upstream/master' 2022-03-10 20:30:08 -05:00
SandPoot 7a2cc5ddfa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-10 22:03:11 -03:00
Solaris-Shade c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -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 21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
BongaTheProto 2ac1138ac1 Merge remote-tracking branch 'upstream/master' 2022-02-24 23:05:13 -05:00
SandPoot 7485eb43eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-23 19:27:32 -03:00
SandPootGitHubChangelogs
 		6c347a9186 Fixes targets (#15521) 
* Automatic changelog compile [ci skip]

* Update files

Co-authored-by: Changelogs <action@github.com>
 2022-02-22 15:50:32 -07:00
BongaTheProto 53699e0a17 Merge remote-tracking branch 'upstream/master' 2022-02-20 17:09:36 -05:00
SandPoot 87c7faed01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-20 19:05:26 -03:00
Putnam3145 a49b19a4f7 makes reinforced plasma glass windows buildable 2022-02-19 19:14:48 -08:00
BongaTheProto ffcca5c46b Merge remote-tracking branch 'upstream/master' 2022-02-08 01:16:02 -05:00
SandPoot 7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03: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
BongaTheProto f18f566e4d Merge remote-tracking branch 'upstream/master' 2022-02-04 00:16:28 -05:00
SandPoot 2d0637221a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 00:59:26 -03:00
SakuraGitHubPutnam3145
 		08b38a7e70 Ashwalker Update (#15466) 
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-02-03 19:34:15 -08:00
SpiWatandGitHub 386a7480a7 Tweenty -> Twenty 
Spelling.
 2022-01-31 19:12:00 -05:00
BongaTheProto 9ce527e068 Merge remote-tracking branch 'upstream/master' 2022-01-26 00:20:29 -05:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
E 9b9925e3bb Merge remote-tracking branch 'origin/master' into i_will_become_back_my_money 2022-01-16 17:12:17 +01:00
BongaTheProto b61101c47b cumcumcumcumcumcumcum 
cumcumcumcumcumcumcum
 2022-01-15 04:03:34 -05:00
LetterN 18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
E b188540454 yeah this took way too long to do 2022-01-10 23:51:03 +01:00
BongaTheProto 9a76d328c4 Merge remote-tracking branch 'upstream/master' 2021-12-31 21:17:10 -05:00
SandPoot 9a633b5395 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-31 14:07:43 -03:00
SandPootandGitHub 8510dcc08a Ports tgui stripping (finally) (#15401) 
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
 2021-12-30 07:40:15 +01:00
LetterN fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
dragonbird13 f8bf0e0ab7 Merge branch 'master' of https://github.com/dragonbird13/S.P.L.U.R.T-Station-13 2021-12-16 00:38:14 +05:00
dragonbird13 cc53f9aeb4 Slightly polishing ghostroles appearance loader, and only. Also polishing my map for more easily start (curse you miners) 2021-12-16 00:37:19 +05:00
BongaTheProto 9c71320f20 Merge remote-tracking branch 'upstream/master' 2021-12-15 12:38:35 -05:00
BongaTheProtoandGitHub 64c70711c2 fixes some runtimes (again) (#211) 2021-12-15 14:25:41 -03:00
Iosyf 01690ddec1 Removing runtimes 
Sometimes the showers were washing null objects
Sometimes the text passed to PaperSheets was null

Added check for both
 2021-12-15 11:55:52 +02:00
E 7dbf33f6af funnies 2021-12-07 09:41:42 +01:00
dragonbird13 a14b4dac51 Returning our own characters on ghostroles! (Ported from Hyper). Now have to add var canloadappearance = TRUE to every ghostrole spawners which allowed to spawn humanlikes 2021-12-04 03:09:00 +05:00
E 52d4143c83 yeet 2021-12-02 00:59:39 +01:00
E 1302ed20ba aa 2021-11-30 23:30:53 +01:00
E 333f0a7da8 megres with boob 2021-11-29 17:30:51 +01:00
E 520a4e7baf it's fucking done 2021-11-29 01:03:26 +01:00
BongaTheProtoandGitHub 4b4dc210c8 Merge branch 'Sandstorm-Station:master' into master 2021-11-27 19:44:41 -05:00
SandPoot 73577046a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-27 20:55:14 -03:00
Linzolle afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00