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-30 08:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
1872 Commits
Author SHA1 Message Date
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
BongaTheProtoandGitHub 07a1011cc8 Merge branch 'Sandstorm-Station:master' into master 2021-11-24 23:06:03 -05:00
SandPoot ed053988d8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-24 22:11:23 -03:00
LinandGitHub d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +00:00
LinandGitHub e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave 
buildmode mapgen tool save [ready]
 2021-11-24 17:32:48 +00:00
LetterN 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
keronshb af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
BongaTheProtoandGitHub 68015817b3 Merge branch 'Sandstorm-Station:master' into master 2021-11-20 02:55:56 -05:00
SandPoot 2f8bfa8667 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-20 01:38:26 -03:00
Artur 99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
E cf757b84af more ashie shit 2021-11-18 23:18:24 +01:00
MrJWhit 47cf0c153a Update loot_pile.dm 2021-11-17 18:36:49 -05:00
BongaTheProto 703413027c Merge remote-tracking branch 'upstream/master' 2021-11-17 14:33:29 -05:00
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
LinandGitHub efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 
Spookystation (Ball Map) and Vector Cars
 2021-11-17 16:26:07 +00:00
LetterN fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
SandPoot ca3eaca314 update bedsheet_bin.dm 2021-11-15 20:48:11 -03:00
SandPoot 5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
DeltaFire 6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
DeltaFire 6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
BongaTheProto 41c7851319 Revert "Revert "Merge pull request #3 from NullFag/ashies"" 
This reverts commit 6ad6a448aa.
 2021-11-14 01:30:30 -05:00
BongaTheProto 6ad6a448aa Revert "Merge pull request #3 from NullFag/ashies" 
This reverts commit 239442d1ba, reversing
changes made to 78e7e3b157.
 2021-11-14 01:13:53 -05:00
E 7efba191d3 most of ashies' shit (w/o heat/ashen hair) 2021-11-14 04:35:13 +01:00
LetterN 8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb 0aceecee2e w hitsound 2021-11-10 16:49:18 -05:00
keronshb efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00