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-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,643 Commits 55 Branches 0 Tags
7f72cb530a60c05f93fd487c4ef705e48aaf73a8
Commit Graph

41643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kiwedespars
6a694841aa i forgot this thing 
microstagger is now a stagger
 2021-02-20 17:46:06 -08:00
kiwedespars
15a8d1d5e0 i did a thing 
- reverted salt nerf
- made it so you can't parry while resting
 2021-02-20 17:24:30 -08:00
timothyteakettle
69e9a94829 prioritise clients 2021-02-21 00:18:25 +00:00
Changelogs
bcffa931b9 Automatic changelog compile [ci skip] 2021-02-21 00:14:18 +00:00
Adelphon
f795d007a9 bugfix 2021-02-20 18:18:27 -05:00
Putnam
a26f850f1c don't push before thinking, kids 2021-02-20 07:41:37 -08:00
Putnam
d6350b2e75 undergarment logging too 2021-02-20 07:41:11 -08:00
Putnam
c24c339718 Fixed a runtime might cause issues. 
This might also break logging completely, which, why. This isn't a high-priority log, though, so.
 2021-02-20 07:36:46 -08:00
CitadelStationBot
0768e693c4 Automatic changelog generation for PR #14258 [ci skip] 2021-02-20 04:02:26 -06:00
silicons
293404f728 Merge pull request #14258 from IronEleven/IronEleven-patch-1 
Raises Space Vine Population Requirement
 2021-02-20 03:02:24 -07:00
CitadelStationBot
6eedbdf984 Automatic changelog generation for PR #14260 [ci skip] 2021-02-20 04:02:18 -06:00
silicons
c70b9bb58d Merge pull request #14260 from timothyteakettle/undeleted-query 
fixes the 'undeleted query' message at the start of every shift
 2021-02-20 03:02:15 -07:00
CitadelStationBot
30926fcfee Automatic changelog generation for PR #14263 [ci skip] 2021-02-20 04:02:09 -06:00
silicons
ecad553fe2 Merge pull request #14263 from Hatterhat/metabreak-b-gon 
the one where i make anomaly announcements and brand intelligence always announce
 2021-02-20 03:02:06 -07:00
silicons
e36794d0f5 Merge pull request #14271 from shellspeed1/revert-14248-trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs 
Revert "Fix for floorbots not placing a plate before placing a floor."
 2021-02-20 02:59:16 -07:00
CitadelStationBot
fa3bb2a08b Automatic changelog generation for PR #14272 [ci skip] 2021-02-20 03:58:22 -06:00
silicons
7fdcacdf19 Merge pull request #14272 from MrJWhit/random-port 
Port of "removes unnecessary %"
 2021-02-20 02:58:19 -07:00
CitadelStationBot
ea94617d76 Automatic changelog generation for PR #14273 [ci skip] 2021-02-20 03:58:08 -06:00
silicons
cabc471d92 Merge pull request #14273 from timothyteakettle/chaplain-vampire 
chaplain vampires won't burn in their own chapel now
 2021-02-20 02:58:06 -07:00
Changelogs
b7d40558e9 Automatic changelog compile [ci skip] 2021-02-20 00:13:42 +00:00
Timothy Teakettle
7c00a9723d Revert "test" 
This reverts commit 7b8b16dc22.
 2021-02-19 23:09:57 +00:00
Timothy Teakettle
7b8b16dc22 test 2021-02-19 22:19:00 +00:00
CitadelStationBot
22cd71a189 Automatic changelog generation for PR #14261 [ci skip] 2021-02-19 14:37:12 -06:00
silicons
030f8ad681 Merge pull request #14261 from SmArtKar/tcg_qol 
[READY] Small QoL changes to TCG
 2021-02-19 13:37:10 -07:00
Timothy Teakettle
9528cc9ce4 woops i left that in 2021-02-19 19:36:19 +00:00
Timothy Teakettle
94ad05b2bc better idea 2021-02-19 17:14:36 +00:00
Timothy Teakettle
9de5e5f5fa Update vampire.dm 2021-02-19 17:07:41 +00:00
MrJWhit
ea47ab1610 Update seed_extractor.dm 2021-02-19 10:00:43 -05:00
shellspeed1
f17be50d5f Revert "Fix for floorbots not placing a plate before placing a floor." 2021-02-18 23:28:10 -08:00
Putnam
257cd6bb34 keyword argument funnies, whoops comma 2021-02-18 21:55:28 -08:00
Lin
d2f9237ecd Merge pull request #14237 from Citadel-Station-13/silicons-patch-11 
adds sanity checks to heretic blade shatters
 2021-02-18 23:51:23 -06:00
Putnam
990df7df37 added exposure logging 2021-02-18 21:36:54 -08:00
CitadelStationBot
071cc29ab0 Automatic changelog generation for PR #14246 [ci skip] 2021-02-18 23:36:22 -06:00
Lin
1acd81c036 Merge pull request #14246 from TyrianTyrell/master 
Multilingual conditions fix.
 2021-02-18 23:36:20 -06:00
CitadelStationBot
b4b50f5c41 Automatic changelog generation for PR #14251 [ci skip] 2021-02-18 23:34:55 -06:00
Lin
0e01f2826b Merge pull request #14251 from Chiirno/SynthHuskTweak 
Massive synthflesh buff
 2021-02-18 23:34:53 -06:00
CitadelStationBot
e5a1a6c2d6 Automatic changelog generation for PR #14262 [ci skip] 2021-02-18 23:34:13 -06:00
Lin
dbcc95ea28 Merge pull request #14262 from timothyteakettle/lawyer-message-all-href 
stops people using Message All on PDAs when their cartridge doesn't allow it
 2021-02-18 23:34:11 -06:00
Putnam
c84dba85dd should also log climaxes (all of them) 2021-02-18 21:31:25 -08:00
Putnam
ecc1ff26bb Slightly more logging, whoops added pref 2021-02-18 21:27:59 -08:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Timothy Teakettle
746ca01823 Update code/game/objects/items/devices/PDA/PDA.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-19 02:10:03 +00:00
CitadelStationBot
c45be49fd3 Automatic changelog generation for PR #14256 [ci skip] 2021-02-18 18:41:53 -06:00
silicons
98d23bb87b Merge pull request #14256 from Adelphon/ppantsg 
Polychromic Pants & Jacket
 2021-02-18 17:41:51 -07:00
silicons
2a6e70941d Update alien.dm 2021-02-18 17:41:27 -07:00
silicons
e792d8d61f Update snacks_meat.dm 2021-02-18 17:35:34 -07:00
silicons
ce013a5122 Update alien.dm 2021-02-18 17:34:51 -07:00
Changelogs
5e9c161163 Automatic changelog compile [ci skip] 2021-02-19 00:13:34 +00:00
silicons
14c9fe655c Update eldritch_items.dm 2021-02-18 17:00:28 -07:00
SandPoot
69af7d35f8 Update remote_materials.dm 2021-02-18 15:16:40 -03:00