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 2025-12-18 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

279 Commits

Author SHA1 Message Date
BongaTheProto
86a005b590 Merge remote-tracking branch 'upstream/master' 2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-10 22:50:16 -03:00
SandPoot
3b8d102fac puts pda in the system to remove shitcode 2023-01-10 20:02:12 -03:00
SandPoot
cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7 element time 2023-01-10 18:08:17 -03:00
BongaTheProto
ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05:00
SandPoot
82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Hatterhat
34eaf93a01 sorters! one-way setting! brazen code borrowing! 2022-12-29 20:18:34 -06:00
BongaTheProto
03f4c65fc4 Merge remote-tracking branch 'upstream/master' 2022-06-11 23:25:29 -05:00
SandPoot
07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
SandPoot
884fcc46c8 Update code/datums/elements/strippable.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2022-06-05 23:49:16 -03:00
SandPoot
670ffd6edf apply silence and fasts 2022-06-05 22:54:16 -03:00
BongaTheProto
92365973ea Merge branch 'master' into prefs-update 2022-05-21 03:18:18 -05:00
BongaTheProto
85ab43e734 Merge remote-tracking branch 'upstream/master' 2022-05-21 03:00:06 -05:00
SandPoot
89fa5c0bfe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-21 00:13:59 -03:00
SandPoot
73da7b6e03 flavor_Text != flavor_text 2022-05-20 00:00:42 -03:00
SandPoot
da1f58f297 Update files 2022-05-19 13:23:17 -03:00
BongaTheProto
603a3fbe9b Merge branch 'master' into prefs-update 2022-05-16 15:00:20 -05:00
Yawet330
3175a2bc16 Should allow ghosts to bypass most flavortext hiding. 2022-05-14 01:18:19 +01:00
BongaTheProto
275eee6c7c headshots 
I'll modularize this when I wake up
 2022-05-09 02:40:18 -05:00
BongaTheProto
90a52494cd Merge remote-tracking branch 'upstream/master' 2022-04-30 16:35:30 -05:00
SandPoot
41949a8be1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-29 13:24:42 -03:00
Timothy Teakettle
2d433e71de grammar 2022-04-26 15:07:58 +01:00
Iosyf
4e2945bf5a ignore this 
Redundancy fix
 2022-04-26 00:26:45 +03:00
Timothy Teakettle
537e72a657 Update trash.dm 2022-04-24 23:38:50 +01:00
Iosyf
847472486d Runtime Ironing out (mostly null checks) 
checking for nulls in:
flavor_text.dm
new_player.dm
coiling.dm
tgyu,dm
lewd_shoes.dm
storage.dm
milking_machine.dm - for some reason tried calling /obj/effect/decal/cleanable/semen/getorganslot() (line 81)
 2022-04-23 19:47:52 +03:00
BongaTheProto
479b497b00 ok 2022-04-19 01:30:44 -05:00
nullfag
a4c5fa6912 "modularity" fix 2022-04-15 00:37:05 +02:00
nullfag
ea17a468a8 naked flavor text 2022-04-15 00:37:05 +02:00
BongaTheProto
a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot
ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
BongaTheProto
f5af499eee Merge branch 'Sandstorm-Station:master' into master 2022-04-06 16:01:25 -05:00
SandPoot
66b05f5261 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-06 16:40:58 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
BongaTheProto
54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot
f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
James
f110d806b4 Adds antag hud, a game pref to show willingness to be kidnapped. 2022-01-30 05:50:24 +00: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
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08: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
SandPoot
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
BongaTheProto
65696e53c7 aaaaaaa 
aaaaaaaaaa
 2021-12-13 01:30:47 -05:00
SandPoot
6790009f7a Size Stuff (#206) 
* Upload files

* Update holder_micro.dm

* Upload files
 2021-12-09 14:13:27 -03:00