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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,847 Commits 55 Branches 0 Tags
caed4b51b9ed1bf80dd1cae3bcdc1c1f7deb8a08
Commit Graph

39847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lin
caed4b51b9 Merge pull request #13756 from silicons/tgui_db 
gives citadel main its own tgui db id to avoid issues but this time i actually don't webedit so i can recompile tgui
 2020-12-20 17:12:12 +00:00
DeltaFire
e5eff3b028 Merge pull request #13792 from Citadel-Station-13/silicons-patch-25 
fixes TEG circulators not being movable when unanchored
 2020-12-20 18:11:33 +01:00
CitadelStationBot
226bc97b1a Automatic changelog generation for PR #13813 [ci skip] 2020-12-20 11:10:57 -06:00
DeltaFire
24b7ef93fe Merge pull request #13813 from Citadel-Station-13/loudmode 
nerfs loudmode headsets from 160% to 120% fontsize
 2020-12-20 18:10:53 +01:00
CitadelStationBot
e215a074ad Automatic changelog generation for PR #13796 [ci skip] 2020-12-20 10:23:23 -06:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges 
Scarp Changes and Bundle
 2020-12-20 09:23:20 -07:00
silicons
6416921560 raise 2020-12-19 18:59:35 -07:00
CitadelStationBot
1f93fd5efa Automatic changelog generation for PR #13803 [ci skip] 2020-12-19 09:08:28 -06:00
DeltaFire
f458bc8182 Merge pull request #13803 from BlueWildrose/AI-RemoteDetonationCBT 
Prevents traitor AI from doomsdaying while carded
 2020-12-19 16:08:25 +01:00
silicons
ad12207503 fix 2020-12-19 06:44:56 -07:00
silicons
e2a99ff223 Recompile 2020-12-19 06:08:28 -07:00
BlueWildrose
98b1de5536 oh yes we don't want that do we? 2020-12-18 22:56:39 -07:00
DeltaFire
b37d948358 Merge pull request #13794 from Citadel-Station-13/silicons-patch-27 
this one line broke atmos more at 10
 2020-12-19 05:38:10 +01:00
DeltaFire
1e8e1ec72b Merge pull request #13786 from kiwedespars/why 
x-ray laser nerfs
 2020-12-19 05:28:43 +01:00
DeltaFire
28da750a55 Merge pull request #13806 from Citadel-Station-13/silicons-patch-30 
adds logging to shell execution
 2020-12-19 04:50:12 +01:00
silicons
c717191447 Update chat-dark.scss 2020-12-18 19:36:57 -07:00
silicons
d00f7daae4 Update chat-light.scss 2020-12-18 19:34:53 -07:00
kiwedespars
9b710f5553 Update beams.dm 2020-12-18 15:53:11 -08:00
CitadelStationBot
e4df3a089a Automatic changelog generation for PR #13804 [ci skip] 2020-12-18 11:32:27 -06:00
silicons
ca49f87e2c Merge pull request #13804 from timothyteakettle/please-sanitize-pin-data 
[s] sanitizes circuits get pin data
 2020-12-18 10:32:24 -07:00
CitadelStationBot
130b621f2d Automatic changelog generation for PR #13790 [ci skip] 2020-12-18 09:04:38 -06:00
DeltaFire
ba7438cb7c Merge pull request #13790 from MrJWhit/mapping-touchups 
Mapping touchups
 2020-12-18 16:04:33 +01:00
CitadelStationBot
f6cce18ccc Automatic changelog generation for PR #13808 [ci skip] 2020-12-18 08:47:02 -06:00
silicons
e0c1f8f700 Merge pull request #13808 from Putnam3145/polycircuit-sanity 
Polycircuit sanity checking
 2020-12-18 07:46:59 -07:00
silicons
2796b48f6d Merge pull request #13810 from Poojawa/patch-3 
Update Citadel_Snowflake.dm
 2020-12-18 07:14:22 -07:00
Poojawa
6fe6e6d779 Update Citadel_Snowflake.dm 2020-12-18 01:36:56 -06:00
Putnam
d47dcc941c Polycircuit sanity checking 2020-12-17 22:54:52 -08:00
silicons
0fae2d4cc9 Update shell.dm 2020-12-17 19:39:55 -07:00
timothyteakettle
2aaddc2ee4 Update helpers.dm 2020-12-18 01:53:53 +00:00
Blue Wildrose
d4d5e53cb6 go away Travis 2020-12-16 19:27:04 -07:00
Blue Wildrose
9c60de46a1 Prevent AI from doomsdaying while carded 2020-12-16 18:45:41 -07:00
kiwedespars
98c3335dce doubles xray laser cost, 20 -> 10 shots 2020-12-15 21:04:10 -08:00
kiwedespars
a95ba25d17 Update beams.dm 
25 -> 75 rad
15 -> 20 damage
 2020-12-15 21:02:46 -08:00
CitadelStationBot
5055cb256d Automatic changelog generation for PR #13763 [ci skip] 2020-12-15 22:17:47 -06:00
DeltaFire
1d604d489c Merge pull request #13763 from Hatterhat/rped-qol 
RPED drops lowest tier parts
 2020-12-16 05:17:44 +01:00
keronshb
3d7c896100 Scarp Changes and Bundle 
This should really fix it now.
 2020-12-15 20:10:21 -05:00
silicons
1d81434bbd Update datum_pipeline.dm 2020-12-15 15:52:00 -07:00
Lin
d776bcc867 Merge pull request #13791 from Citadel-Station-13/silicons-patch-23 
[s]Update saved_circuits.dm
 2020-12-15 21:46:48 +00:00
CitadelStationBot
7c10eff158 Automatic changelog generation for PR #13725 [ci skip] 2020-12-15 15:24:33 -06:00
Lin
c022956c75 Merge pull request #13725 from silicons/anti_collision_bindings 
makes keybind system automatically generate anti-collision keybinds where necessary to avoid unintentional macro fires
 2020-12-15 21:24:30 +00:00
CitadelStationBot
650b40bf37 Automatic changelog generation for PR #13784 [ci skip] 2020-12-15 15:22:04 -06:00
Lin
53f5405d02 Merge pull request #13784 from MrJWhit/landmine-effect-port 
Port of "Effects can no longer trigger landmines"
 2020-12-15 21:22:01 +00:00
silicons
4a30064a2c Update saved_circuits.dm 2020-12-15 14:09:44 -07:00
silicons
bc9dbc0060 Update circulator.dm 2020-12-15 14:00:20 -07:00
silicons
4d6f2118c8 Update saved_circuits.dm 2020-12-15 13:32:27 -07:00
MrJWhit
9f7d87759d Update BoxStation.dmm 2020-12-15 13:55:30 -05:00
MrJWhit
c34656c5e8 The rest of the stuff 2020-12-15 13:51:04 -05:00
MrJWhit
68cf6a845c Boxstation fixes 2020-12-15 13:35:41 -05:00
silicons
6fea2c2b3a recompile 2020-12-15 02:56:16 -07:00
kiwedespars
92c70b8089 Update beams.dm 2020-12-14 19:46:28 -08:00