Commit Graph

18497 Commits

Author SHA1 Message Date
DeltaFire 3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
2021-01-06 19:29:17 +01:00
DeltaFire 8b876aa6e3 Merge pull request #13957 from Citadel-Station-13/silicons-patch-1
[s] logging patch 36735734
2021-01-06 19:23:09 +01:00
shellspeed1 98f8af853c Minor xenohybrid changeschanges
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
2021-01-06 01:58:58 -08:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons 6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds
Ding for prayers
2021-01-05 23:39:37 -07:00
silicons 2ad58a7a9d Update mobs.dm 2021-01-05 17:47:05 -07: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
zeroisthebiggay 55d40f6b2d oh yeah fuck descriptions 2021-01-05 16:32:38 -05: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
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
Xantholne 18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
silicons b3af424687 Update penis.dm 2021-01-05 02:46:30 -07:00
silicons 21bbbe6f2f Update breasts.dm 2021-01-05 02:46:00 -07:00
Artur ffe20839fe tweaks loss numbers 2021-01-04 23:46:48 +02:00
Artur 6388c3cf55 Blood bag delays 2021-01-04 23:43:33 +02:00
Artur 9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
keronshb af3c8edf01 Small blob tweaks + fix
Fixes the permanent consumption of a factory blob w/ blobbernaut failure.  Also changes resource blob pointgen from 1 to 2 and allows factory blobs to be placed across 5 tiles instead of 7.
2021-01-04 12:32:41 -05:00
Fermi 619490b040 oops 2021-01-04 16:32:06 +00:00
Fermi 5b703e84a4 Merge branch 'master' into Dispencer-UI-change 2021-01-04 16:21:06 +00:00
Fermi d9047e458c Testing and bugfixes 2021-01-04 15:47:35 +00:00
Fermi 57cd698994 Tweaks and fixes. Should be freature complete now. 2021-01-04 13:40:26 +00:00
Fermi c7965d3b4a Pushing to review diff 2021-01-04 10:53:21 +00:00
Xantholne fe4f184792 good night disky 2021-01-04 03:50:43 -07:00
silicons c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07:00
necromanceranne 6650d3518a Mostly ports tgstation #54644; New roboticist labcoat sprites 2021-01-04 20:45:11 +11:00
Letter N cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
Fermi 37c3bbbd9c Fixing things and gui 2021-01-04 01:48:35 +00:00
silicons 3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout
Nightmare Lights Damage Buff
2021-01-03 18:15:00 -07: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
silicons 8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix
Chemmaster output buff
2021-01-03 18:12:57 -07:00
silicons da358fa60a Update mobs.dm 2021-01-03 18:12:33 -07: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
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
silicons c3e4eed5c7 Merge pull request #13938 from timothyteakettle/funny-synths
anthromorphic synth species
2021-01-03 18:10:06 -07: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
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 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
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
silicons 0555756dde Merge pull request #13946 from uomo91/logfix
[Port] Fixes log collisions
2021-01-03 18:08:39 -07:00
silicons 697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
2021-01-03 18:07:18 -07:00
silicons 0bb0f89ca2 Update pen.dm 2021-01-03 18:03:36 -07: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
Letter N 6e060b13f5 all done 2021-01-02 20:17:19 +08:00
Letter N 64f9605b51 map conflict any% 2021-01-02 19:56:04 +08:00
Blue Wildrose 642c4a5806 erect up the config instead in case this situation comes up again. 2021-01-02 00:18:49 -07:00
Blue Wildrose 843b1494b3 max penis size increased before being punished for having one 2021-01-01 23:01:39 -07:00
Timothy Teakettle dc44102d8b fix 2021-01-01 22:39:16 +00:00