Commit Graph
40504 Commits
Author SHA1 Message Date
CitadelStationBot 1c89963be0 Automatic changelog generation for PR #13947 [ci skip] 2021-01-03 19:12:59 -06:00
siliconsandGitHub 8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix
Chemmaster output buff
2021-01-03 18:12:57 -07:00
siliconsandGitHub da358fa60a Update mobs.dm 2021-01-03 18:12:33 -07:00
CitadelStationBot f84e6bea01 Automatic changelog generation for PR #13932 [ci skip] 2021-01-03 19:11:20 -06:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
2021-01-03 18:07:18 -07:00
siliconsandGitHub 0bb0f89ca2 Update pen.dm 2021-01-03 18:03:36 -07:00
EmeraldSundiskandGitHub 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
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
Putnam3145andGitHub 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
LinandGitHub 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
Blue Wildrose 642c4a5806 erect up the config instead in case this situation comes up again. 2021-01-02 00:18:49 -07:00
EmeraldSundisk 5961d09298 Update CogStation.dmm 2021-01-01 23:08:21 -08:00
EmeraldSundisk 291c0a0a22 Update Space_Station_13_areas.dm 2021-01-01 22:46:36 -08:00
EmeraldSundiskandGitHub 98e3464604 Merge pull request #74 from Citadel-Station-13/master
1/1
2021-01-01 22:34:38 -08:00
Blue Wildrose 843b1494b3 max penis size increased before being punished for having one 2021-01-01 23:01:39 -07:00
TripleShades bf8c87f373 Update MetaStation.dmm
fixes surgery apc being rotated incorrectly, moves wheelchair out of storage for public access
2021-01-01 15:49:57 -08:00
TripleShades c57a5520fa Update MetaStation.dmm 2021-01-01 14:59:01 -08:00
Timothy Teakettle dc44102d8b fix 2021-01-01 22:39:16 +00:00
Timothy Teakettle 974f46cb22 attempt to fix 2021-01-01 22:36:35 +00:00
Timothy Teakettle 813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
siliconsandGitHub 190fcb312b Update mobs.dm 2021-01-01 12:24:46 -07:00
necromanceranne 6a247e2a68 Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites 2021-01-02 04:26:39 +11:00
Chiirno 336272fb02 Nevermind, I heard the catgirl wrong we're going back. 2021-01-01 05:42:35 -04:00
Chiirno 977f0c4cc9 how about this 2021-01-01 05:39:23 -04:00
Chiirno fd2bbe23e0 A catgirl on discord told be replacing the bundle file would be ok 2021-01-01 05:33:34 -04:00
CitadelStationBot 368a8d5726 Automatic changelog generation for PR #13930 [ci skip] 2021-01-01 03:17:19 -06:00
siliconsandGitHub 9cebd096eb Merge pull request #13930 from MrJWhit/fixing-up-sec-on-box
Touchups for sec box
2021-01-01 02:17:16 -07:00