Commit Graph

19184 Commits

Author SHA1 Message Date
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
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
silicons
190fcb312b Update mobs.dm 2021-01-01 12:24:46 -07:00
Chiirno
da5ea18c9a OK, compiling did something funky to the dm code? 2021-01-01 04:04:39 -04:00
Chiirno
bbeed2b8f0 I've done it, I've edited TgUI! 2021-01-01 04:00:35 -04:00
DeltaFire
a2bb761bee Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
2021-01-01 08:15:53 +01:00
DeltaFire
ee6601276d Merge pull request #13935 from Citadel-Station-13/silicons-patch-58
fixes a bug
2021-01-01 08:11:40 +01:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
DeltaFire
2ed866d855 boom 2021-01-01 07:22:10 +01:00
Hatterhat
e63e0ac9bd something about wardrobes 2020-12-31 22:03:09 -06:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-01 04:14:26 +01:00
Chiirno
218cac1a49 OK, chem mixer has been added to a tech node now. 2020-12-31 22:19:51 -04:00
Chiirno
6f5837d14f changed the description of the crate. 2020-12-31 17:42:07 -04:00