Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
Hatterhat
|
9b2d62b9ef
|
whoops again
|
2021-03-02 22:09:38 -06:00 |
|
Hatterhat
|
dc5ca7a556
|
oops
|
2021-03-02 22:07:13 -06:00 |
|
Hatterhat
|
053f9ea857
|
any%
|
2021-03-02 22:06:57 -06: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 |
|
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 |
|
silicons
|
0f16178425
|
changes
|
2021-02-28 02:43:32 -07:00 |
|
silicons
|
519c694252
|
removes combat mode effects
|
2021-02-28 00:44:56 -07:00 |
|
silicons
|
8fc1dc9c29
|
changes
|
2021-02-28 00:40:04 -07:00 |
|
silicons
|
e43838739d
|
changes
|
2021-02-28 00:37:39 -07:00 |
|
silicons
|
8e249eed4f
|
changes
|
2021-02-28 00:33:10 -07:00 |
|
silicons
|
70c828f74d
|
changes
|
2021-02-28 00:27:14 -07:00 |
|
silicons
|
70b8d833c0
|
changes
|
2021-02-28 00:00:14 -07:00 |
|
kiwedespars
|
081b669345
|
Merge branch 'master' into we-hate-cqc
|
2021-02-27 22:19:16 -08:00 |
|
Putnam
|
50c1a83c6a
|
Adds a pAI policy config
|
2021-02-26 00:34:13 -08:00 |
|
silicons
|
504a36f50d
|
Update holy_weapons.dm
|
2021-02-24 01:36:03 -07:00 |
|
SandPoot
|
6c5acc3b4d
|
upload files
|
2021-02-23 16:42:07 -03: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 |
|
silicons
|
841bb2aac2
|
Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
|
2021-02-21 14:48:50 -07:00 |
|
kiwedespars
|
de69e9996a
|
nerfs cqc
|
2021-02-21 13:10:08 -08:00 |
|
Timothy Teakettle
|
b2015e4c94
|
blacklist
|
2021-02-21 17:32:07 +00:00 |
|
Letter N
|
7c0a63f729
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-21 09:57:22 +08:00 |
|
timothyteakettle
|
deb1a5374d
|
Update ghost_role_spawners.dm
|
2021-02-20 00:33:57 +00:00 |
|
timothyteakettle
|
d34c821db4
|
Update ghost_role_spawners.dm
|
2021-02-19 23:45:01 +00:00 |
|
Timothy Teakettle
|
a444918936
|
Update ghost_role_spawners.dm
|
2021-02-19 23:11:41 +00: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
|
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 |
|
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 |
|
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 |
|
Timothy Teakettle
|
96d80901e4
|
Update PDA.dm
|
2021-02-17 17:26:45 +00: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 |
|
SmArtKar
|
e4afe49687
|
Adds card crafting!"
|
2021-02-16 19:38:48 +03:00 |
|
Letter N
|
3f40e353aa
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-16 19:41:53 +08:00 |
|
keronshb
|
d87ac38e58
|
Eutactic Blade Restoration + Hyperblade
Brings the Eutatic Blade back to the traitor uplink, same for the Hyperblade.
|
2021-02-15 21:36:47 -05:00 |
|
SandPoot
|
4e18044450
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui
|
2021-02-14 20:10:41 -03:00 |
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
Hatterhat
|
c5a9a8905a
|
actually makes golem gpses start off
|
2021-02-13 15:20:24 -06:00 |
|
Letter N
|
45d6a5f87f
|
it compiles, UNTESTED YET
|
2021-02-13 21:41:59 +08:00 |
|
silicons
|
76837ee0b6
|
Merge pull request #14225 from Hatterhat/dth-kit-pass2
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
|
2021-02-12 18:54:36 -07:00 |
|