Commit Graph

40333 Commits

Author SHA1 Message Date
Timothy Teakettle
44667ae1b6 edits 2021-01-07 16:46:42 +00:00
timothyteakettle
22cab3c275 sprite fixes 2021-01-05 23:28:53 +00:00
timothyteakettle
a375448a54 fixes 2021-01-05 23:18:52 +00:00
Timothy Teakettle
535dede85b i teleported bread 2021-01-05 22:20:41 +00:00
Lin
f724554059 Merge pull request #13964 from Citadel-Station-13/silicons-patch-2
fixes parrying working while otherwise paralyzed
2021-01-05 16:48:20 +00:00
CitadelStationBot
7e1819edcd Automatic changelog generation for PR #13856 [ci skip] 2021-01-05 03:52:45 -06:00
silicons
cfc560ed3d Merge pull request #13856 from Putnam3145/harness-tweak-2
Actually made gear harness properly adjustable
2021-01-05 02:52:41 -07:00
silicons
c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07:00
CitadelStationBot
8b18d4b3c5 Automatic changelog generation for PR #13959 [ci skip] 2021-01-03 22:37:35 -06:00
silicons
d6d753e9f7 Merge pull request #13959 from necromanceranne/bokken_fixes
Bokken Fixes: You can make them now. Nyoops.
2021-01-03 21:37:33 -07:00
necromanceranne
0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
CitadelStationBot
afd1e8b5a9 Automatic changelog generation for PR #13954 [ci skip] 2021-01-03 21:19:49 -06:00
silicons
a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks
Cog and firelocks.
2021-01-03 20:19:46 -07:00
CitadelStationBot
f29a89c2da Automatic changelog generation for PR #13948 [ci skip] 2021-01-03 19:18:32 -06:00
silicons
4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
2021-01-03 18:18:29 -07:00
CitadelStationBot
68c96108b9 Automatic changelog generation for PR #13955 [ci skip] 2021-01-03 19:15:03 -06:00
silicons
3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout
Nightmare Lights Damage Buff
2021-01-03 18:15:00 -07:00
CitadelStationBot
81642a34a1 Automatic changelog generation for PR #13951 [ci skip] 2021-01-03 19:13:53 -06:00
silicons
7357ae3bc0 Merge pull request #13951 from BlueWildrose/CompensatingForSomething
Max groin cannon size increased before being punished for erecting a massive mayo-blaster to -max roundstart config- inches instead of 20
2021-01-03 18:13:50 -07:00
CitadelStationBot
1c89963be0 Automatic changelog generation for PR #13947 [ci skip] 2021-01-03 19:12:59 -06:00
silicons
8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix
Chemmaster output buff
2021-01-03 18:12:57 -07:00
CitadelStationBot
f84e6bea01 Automatic changelog generation for PR #13932 [ci skip] 2021-01-03 19:11:20 -06:00
silicons
092e7569c2 Merge pull request #13932 from shellspeed1/Ports-xeno-QOL-stuff
Ports xenomorph plasma usage in power description from bee
2021-01-03 18:11:18 -07:00
CitadelStationBot
13afb10b08 Automatic changelog generation for PR #13934 [ci skip] 2021-01-03 19:11:13 -06:00
silicons
ccbfd4015e Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon
Ports bluespace navigation gigabeacon from TG
2021-01-03 18:11:10 -07:00
CitadelStationBot
c4a0907a31 Automatic changelog generation for PR #13936 [ci skip] 2021-01-03 19:10:47 -06:00
silicons
b164d6e75b Merge pull request #13936 from BlueWildrose/hoodyhoodu
Fixes loadout specific polychromic hoodies not having their hoods polychromable
2021-01-03 18:10:44 -07:00
CitadelStationBot
cbce47388d Automatic changelog generation for PR #13938 [ci skip] 2021-01-03 19:10:09 -06:00
silicons
c3e4eed5c7 Merge pull request #13938 from timothyteakettle/funny-synths
anthromorphic synth species
2021-01-03 18:10:06 -07:00
CitadelStationBot
9dd5d2c88f Automatic changelog generation for PR #13940 [ci skip] 2021-01-03 19:10:02 -06:00
silicons
c947dfdca5 Merge pull request #13940 from Chiirno/CargoParamedSuit
Paramedic EVA suit now purchasable from Cargo
2021-01-03 18:09:59 -07:00
CitadelStationBot
693b99edf2 Automatic changelog generation for PR #13941 [ci skip] 2021-01-03 19:09:53 -06:00
silicons
2641332fb2 Merge pull request #13941 from Chiirno/ChemMixerHotfix
Portable Chem Mixer now added to the Biological Technology tech node.
2021-01-03 18:09:50 -07:00
silicons
0581748282 Merge pull request #13942 from YakumoChen/power-sink
#13925 but doesn't underestimate engineering autism
2021-01-03 18:09:38 -07:00
CitadelStationBot
c825174283 Automatic changelog generation for PR #13943 [ci skip] 2021-01-03 19:09:23 -06:00
silicons
89913ebc18 Merge pull request #13943 from Hatterhat/imagine-modularizing
utility uniform typos and making the capdrobe not suck
2021-01-03 18:09:20 -07:00
CitadelStationBot
8e97f87f70 Automatic changelog generation for PR #13945 [ci skip] 2021-01-03 19:09:01 -06:00
silicons
d6bd5d4bac Merge pull request #13945 from DeltaFire15/synth-organ-printing
Makes IPC cells & power cords printable
2021-01-03 18:08:58 -07:00
CitadelStationBot
de5e817692 Automatic changelog generation for PR #13946 [ci skip] 2021-01-03 19:08:42 -06:00
silicons
0555756dde Merge pull request #13946 from uomo91/logfix
[Port] Fixes log collisions
2021-01-03 18:08:39 -07:00
CitadelStationBot
f97d750909 Automatic changelog generation for PR #13950 [ci skip] 2021-01-03 19:08:17 -06:00
silicons
64a5b99e63 Merge pull request #13950 from TripleShades/meta-medical
MetaStation Paramedical + Surgery Revamp
2021-01-03 18:08:15 -07:00
CitadelStationBot
d9d0763004 Automatic changelog generation for PR #13859 [ci skip] 2021-01-03 19:07:21 -06:00
silicons
697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
2021-01-03 18:07:18 -07:00
EmeraldSundisk
3e813c1ecc Add files via upload 2021-01-03 00:16:02 -08:00
Chiirno
84d311e201 nightmare now oneshots glowshrooms, miner beacons, and console screens. 2021-01-03 02:44:47 -04:00
shellspeed1
c8ce23886c Update code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-02 22:10:36 -08:00
Putnam3145
f1b7c4aea5 Update miscellaneous.dm 2021-01-02 17:30:06 -08:00
TripleShades
79db7e0db5 Changed out lightswitch for extinguisher on Recovery Room outer wall; Replaced wall with Clean Hands poster with a drape; Added Nanomeds to surgery 2021-01-02 16:00:49 -08:00
Lin
b3c1c69861 Merge pull request #13944 from Citadel-Station-13/silicons-patch-59
fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)
2021-01-02 16:17:24 +00:00