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 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,713 Commits 55 Branches 0 Tags
8989394742a93f8267a0d42d55c0bede32bb8bb7
Commit Graph

41713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +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
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
SmArtKar
689293428b Update code/modules/tcg/cards.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-18 17:44:38 +03:00
SmArtKar
5e8209a6e9 Update code/modules/tcg/cards.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-18 17:44:33 +03:00
SmArtKar
21012bf94e oof 2021-02-18 14:39:56 +03:00
SmArtKar
b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
CitadelStationBot
724910cfab Automatic changelog generation for PR #14249 [ci skip] 2021-02-18 00:11:15 -06:00
Lin
8bf3706876 Merge pull request #14249 from Putnam3145/buzz-fuzz-fix 
Set buzz fuzz's addiction threshold to fit the comment
 2021-02-18 00:11:13 -06:00
CitadelStationBot
0ef3b9dfb8 Automatic changelog generation for PR #14259 [ci skip] 2021-02-18 00:01:35 -06:00
Lin
b0c4fa5755 Merge pull request #14259 from timothyteakettle/log-pierced-reality-examine 
staring into pierced realities is now logged
 2021-02-18 00:01:32 -06:00
Hatterhat
6d28c27f36 aoaoaoaooaoa 2021-02-17 23:24:44 -06:00
dzahlus
bf61249fcd new pain sounds 2021-02-18 04:38:02 +01:00
Changelogs
7f96ac2847 Automatic changelog compile [ci skip] 2021-02-18 00:13:49 +00:00
CitadelStationBot
a07b588c9f Automatic changelog generation for PR #14239 [ci skip] 2021-02-17 17:29:06 -06: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
CitadelStationBot
e5e66be6b3 Automatic changelog generation for PR #14248 [ci skip] 2021-02-17 17:28:05 -06:00
Lin
460042bc33 Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs 
Fix for floorbots not placing a plate before placing a floor.
 2021-02-17 17:28:03 -06:00
CitadelStationBot
a6919de075 Automatic changelog generation for PR #14252 [ci skip] 2021-02-17 16:57:04 -06:00
Lin
a27e4ba9e9 Merge pull request #14252 from silicons/pet_peeve 
spellchecks priviledge --> privilege
 2021-02-17 16:57:01 -06:00
CitadelStationBot
6558ace359 Automatic changelog generation for PR #14255 [ci skip] 2021-02-17 14:24:10 -06:00
Lin
2b67893ed1 Merge pull request #14255 from LetterN/patch-4 
Disallows specific fermichem to deal liver damage
 2021-02-17 14:24:06 -06:00
Timothy Teakettle
96d80901e4 Update PDA.dm 2021-02-17 17:26:45 +00:00
SmArtKar
fecf879b0c Fixed 2021-02-17 18:54:59 +03:00
SmArtKar
756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
CitadelStationBot
3fe46423a8 Automatic changelog generation for PR #14254 [ci skip] 2021-02-17 09:21:44 -06:00
Putnam3145
d1a6fa972f Merge pull request #14254 from BlueWildrose/holodick 
Messages admins of certain holodeck actions
 2021-02-17 07:21:41 -08:00
SmArtKar
015bd0b145 reeee 2021-02-17 17:16:52 +03:00
SmArtKar
eae7e36b95 E 2021-02-17 17:16:33 +03:00
SmArtKar
0b3b1cef7a Small QoL changes to TCG 2021-02-17 17:07:15 +03:00
CitadelStationBot
be15f67dee Automatic changelog generation for PR #14236 [ci skip] 2021-02-17 07:35:30 -06:00
Putnam3145
74e6f9198b Merge pull request #14236 from dzahlus/toxic-objective-removal 
Removes prevent from leaving alive, maroon objective
 2021-02-17 05:35:27 -08:00
CitadelStationBot
8dfb0aa5d0 Automatic changelog generation for PR #14186 [ci skip] 2021-02-17 02:30:16 -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