Commit Graph

9361 Commits

Author SHA1 Message Date
Putnam
652398be4d i forgot i renamed this 2021-03-08 15:25:51 -08:00
Putnam
cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
silicons
21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket
MWS-01 Changes
2021-03-06 16:59:46 -07:00
Letter N
2de08b7bae lateinit mayhaps? 2021-03-06 20:01:14 +08:00
Letter N
e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
DeltaFire
357853863e Merge pull request #14352 from timothyteakettle/jar-nerf
exiting a bluespace jar through any means, hardstuns you for 5 seconds
2021-03-06 03:50:35 +01:00
Letter N
a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Letter N
c624c3ae14 economical inflation 2021-03-05 20:00:45 +08:00
Letter N
34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Putnam3145
43d66e90b7 Merge pull request #14356 from keronshb/RPlasmaTweak
Removes Superconuctivity from Reinforced Plasma Glass
2021-03-04 09:33:45 -08:00
Letter N
dcab40cdb6 building pipeline 2021-03-04 21:51:20 +08:00
Letter N
45278c02a2 send it 2021-03-04 16:41:42 +08:00
Letter N
7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Putnam
2137818d76 Massively reduced max-size minesweeper 2021-03-03 18:42:35 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
keronshb
b105556603 No Superconductivity with Reinforced Plasma Glass
Removes heat going through RPlasma Glass
2021-03-02 21:45:36 -05:00
silicons
824f346763 Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix
[FIX] More pacifism bug squashing
2021-03-02 16:57:26 -07:00
timothyteakettle
f0d219e999 Update pet_carrier.dm 2021-03-02 14:26:53 +00:00
timothyteakettle
a5c17eead4 Update pet_carrier.dm 2021-03-02 14:25:44 +00:00
Putnam
f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
silicons
6f91da89d7 Merge pull request #14322 from Putnam3145/pai-policy
Adds a pAI policy config
2021-03-01 18:26:57 -07:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
qweq12yt
d3aeb714f1 flamethrowers now can't be used by pacifists 2021-02-28 20:21:19 -03:00
Letter N
573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
Letter N
c5e8d8131e you're going on the tabl 2021-02-27 17:47:22 +08:00
Putnam
50c1a83c6a Adds a pAI policy config 2021-02-26 00:34:13 -08:00
Lin
ecc61689f8 Merge pull request #14305 from Citadel-Station-13/silicons-patch-18
sam dennison you exploit hoarding banana i will shove a barrel of ghost peppers down your throat for this crime
2021-02-25 20:35:08 -06:00
Lin
bc8b253837 Merge pull request #14303 from DeltaFire15/wiring-skillgain
Adds state check callbacks to machine frame tool use
2021-02-25 18:03:00 -06:00
Putnam
c641c523bd that should NOT be there 2021-02-25 00:43:20 -08:00
Putnam
c787b6f59a Updated to 514. 2021-02-25 00:09:40 -08:00
silicons
504a36f50d Update holy_weapons.dm 2021-02-24 01:36:03 -07:00
DeltaFire
60708b03df check 2021-02-24 05:16:15 +01:00
SandPoot
6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
178fe9cf55 Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
2021-02-22 13:10:21 -07:00
Timothy Teakettle
5c2f5cf8a7 Update charter.dm 2021-02-22 17:07:10 +00:00
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N
0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08: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
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
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +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
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00