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,477 Commits 55 Branches 0 Tags
d2f9237ecdbb1d1e2a430316dd9a30acdcbc86ad
Commit Graph

41477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
shellspeed1
303d35074d Another fix for infinite floor tiles 2021-02-16 20:24:50 -08:00
Timothy Teakettle
e50073e636 Update eldritch_effects.dm 2021-02-16 20:54:37 +00:00
SmArtKar
3e95e28f85 Illegal cards will now permanently be marked, not for just one round 2021-02-16 20:05:59 +03:00
SmArtKar
598c19996c Oopsie 2021-02-16 19:53:27 +03:00
SmArtKar
e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
SmArtKar
664f81585b Adds undef 2021-02-16 19:11:04 +03:00
SmArtKar
0e1e3aaaed and more 2021-02-16 18:57:43 +03:00
SmArtKar
799917bc70 and more 2021-02-16 16:24:37 +03:00
SmArtKar
8abce43547 Fixes 2021-02-16 16:04:31 +03:00
SmArtKar
3da4c73fbe Slight changes to balance, new cards 2021-02-16 15:57:05 +03:00
Adelphon
4c6685333b Polychromic Pants & Jacket 2021-02-16 05:24:45 -05:00
Letter N
a17716be5b bye 2021-02-16 18:15:02 +08:00
SmArtKar
cf76b9d740 Fixes card saving, fixes some icons, adds rulebook 2021-02-16 12:12:20 +03:00
TyrianTyrell
6f25b65290 Apply suggestions from code review 
Let's see if it will?

Co-authored-by: Lin <linzolle@gmail.com>
 2021-02-16 03:24:27 -05:00
Blue Wildrose
99a1991e0a Messages admins of certain holodeck actions 2021-02-15 19:55:05 -07:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Chiirno
8257283cef Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-02-15 22:03:12 -04:00
Lin
975c98731e Merge pull request #14242 from timothyteakettle/age-gate-2-electric-boogaloo 
age gate 2 electric boogaloo
 2021-02-15 18:16:44 -06:00