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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,586 Commits 55 Branches 0 Tags
0939e3198287839b8053108d95f7700bc4e40c3b
Commit Graph

3489 Commits

Author SHA1 Message Date
silicons
f581d8c8e0 Merge pull request #14264 from dzahlus/pain-emote-updates 
Pain emote is now added to getting wounded! As well as more pain sounds
 2021-02-21 14:56:26 -07:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd 
More arousal logging; adds back aphro/nympho
 2021-02-21 14:50:32 -07:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
SandPoot
69af7d35f8 Update remote_materials.dm 2021-02-18 15:16:40 -03:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
dzahlus
2f6527800e monke getting wounded *pain's lmao 2021-02-18 15:55:23 +01:00
Lin
3b9f1cb4ec Merge pull request #14239 from Hatterhat/golem-gps-pass2 
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
 2021-02-17 17:29:03 -06:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
SandPoot
4e18044450 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui 2021-02-14 20:10:41 -03:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master 
Multilingual fix? (Has since been tested.)
 2021-02-13 16:41:10 -06:00
Hatterhat
c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
TyrianTyrell
a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05:00
SandPoot
a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
TyrianTyrell
5769cc106b Update good.dm 2021-02-10 13:56:56 -05:00
TyrianTyrell
e5fea58776 Update good.dm 2021-02-08 07:32:22 -05:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master 
Signed language (Requested changes complete)
 2021-02-06 11:42:24 -07:00
TyrianTyrell
fb592b70a1 Update negative.dm 2021-02-04 15:10:12 -05:00
TyrianTyrell
44366a4a2e Currently removing phobia picking 2021-02-04 15:04:17 -05:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe 
Port of TG's "Auto Observe"
 2021-02-04 12:49:09 -07:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
TyrianTyrell
678d0c950f Update negative.dm 2021-02-01 05:48:34 -05:00
TyrianTyrell
9bda74c58d Update good.dm 2021-02-01 05:34:45 -05:00
Lin
1d275656b5 Merge pull request #14081 from Citadel-Station-13/silicons-patch-22 
makes paraplegic spawn effects yield for calling function which MIGHT fix not spawning in with a wheelchair maybe(?)
 2021-01-31 23:34:20 -06:00
Lin
0dd82df64b Merge pull request #14113 from silicons/piggybacking 
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
 2021-01-31 23:33:59 -06:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3 
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
 2021-01-27 17:16:44 -06:00
Putnam3145
2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24 
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
 2021-01-26 22:24:57 -08:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs 
itt: i dont test my code again - free golem ship GPSes start disabled
 2021-01-25 22:59:09 -07:00
raspy-on-osu
f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
e06f0bbc72 fixes 2021-01-20 16:01:09 -07:00
silicons
f6a8306174 Merge pull request #14109 from Arturlang/space_tackling_meme_fix 
Fixes the space tackling meme
 2021-01-20 15:17:36 -07:00
silicons
5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 2021-01-20 15:15:10 -07:00
silicons
f6eca7afad hugboxy shit 2021-01-20 15:06:53 -07:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Artur
5aa710ffd7 spess 2021-01-20 16:05:20 +02:00
Artur
ef950400a4 Fixes the space tackling meme 2021-01-20 15:50:41 +02:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
6146a4ca9a Update mob_holder.dm 2021-01-17 20:24:53 -07:00
silicons
085540af3c Update negative.dm 2021-01-17 15:21:31 -07:00
silicons
3d8bae8cef Update _quirk.dm 2021-01-17 15:20:37 -07:00
silicons
b6cdde2f52 squeak fix 2021-01-16 06:12:34 -07:00
silicons
e96fec682e fix 2021-01-16 04:59:07 -07:00