Commit Graph

23791 Commits

Author SHA1 Message Date
variableundefined
44308cbc44 Merge pull request #16714 from SteelSlayer/claw-machine-fix
Fixes the Claw Game arcade machine being impossible to deconstruct.
2021-09-17 20:37:18 -05:00
variableundefined
5a1736852c Merge pull request #16709 from Vi3trice/awaken-my-masters
Fix - Set nymph's evolve icon
2021-09-17 20:31:58 -05:00
variableundefined
537b72daaf Merge pull request #16717 from Fox-McCloud/earthsblood-nerf
Nerfs Earthsblood
2021-09-16 21:18:28 -04:00
variableundefined
3ebd3334ce Merge pull request #16716 from Fox-McCloud/botany-nerf
Removes Separated Chemicals
2021-09-16 21:18:17 -04:00
SteelSlayer
950b64c9af !panel_open check 2021-09-16 20:09:18 -05:00
variableundefined
212f65672d Merge pull request #16705 from SabreML/ant-protection
Prevents ants from infesting wrapped/packaged food
2021-09-16 20:52:10 -04:00
SabreML
ec1b49875f Colourblind fixing fix (#16698) 2021-09-16 18:18:55 +01:00
Lumi
b5df23090f adds mask, removes mouse (#16712)
removes the clockwork mouse, adds the fluff mask
2021-09-15 21:49:41 +01:00
Fox McCloud
3e9001f7ee Nerfs Earthsblood 2021-09-15 14:32:10 -04:00
Fox McCloud
b98929ac20 Removes Separated Chemicals 2021-09-15 13:14:27 -04:00
SteelSlayer
c7f76211b7 claw machine decon fix 2021-09-15 01:05:37 -05:00
Vi3trice
18cf243ce8 Sets nymph's evolve icon 2021-09-13 15:59:20 -04:00
Vi3trice
6e5c0f9b38 Spelling 2021-09-13 11:01:38 -04:00
Vi3trice
4722b80300 Checks equipped glasses or headgear instead of just contents 2021-09-13 10:50:10 -04:00
SabreML
83f0c55bdb No ants on wrapped foods 2021-09-13 12:31:36 +01:00
Vi3trice
6657630a95 Update code/modules/reagents/chemistry/reagents/misc.dm
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-09-12 16:17:08 -04:00
Vi3trice
647f8e41e5 Spraytan gradually makes you darker 2021-09-12 14:22:00 -04:00
variableundefined
7e2b6f6f4f Merge pull request #16677 from S34NW/note-deletion-confirmation
Note deletion confirmation
2021-09-12 11:03:53 -05:00
variableundefined
6c085cf23b Merge pull request #16064 from michaelyesok/foampistol
Foam enforcer tweaks
2021-09-11 19:12:07 -05:00
variableundefined
aeae11d3ab Merge pull request #16631 from sldomino/claw-game-fix
fixes claw game arcade
2021-09-11 19:00:09 -05:00
variableundefined
24fb247915 Merge pull request #16687 from Adrer/Limb-augmentation-fix-again
Diona limbs now ACTUALLY properly augment
2021-09-11 16:10:49 -05:00
variableundefined
cd6da4b2ad Merge pull request #16683 from SabreML/gibber-invisibility
Fixes gibber deconstruction
2021-09-11 16:05:18 -05:00
E-MonaRhg
f4e58a0961 Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-11 20:26:54 +02:00
variableundefined
7cffabf93c Merge pull request #16422 from Qwertytoforty/too-hot-to-handle
Immolator lasers now immolate all mobs
2021-09-11 13:22:02 -05:00
variableundefined
d5639d1e7b Merge pull request #16674 from S34NW/fence-railings
Adds railings and fences
2021-09-11 13:11:42 -05:00
adrermail@gmail.com
b9344a258e Diona limbs now ACTUALLY properly augment children 2021-09-11 20:05:23 +02:00
variableundefined
a056c36931 Merge pull request #16668 from Qwertytoforty/a-core-issue
Adds warning messages to admins for missing nukes
2021-09-11 12:51:08 -05:00
Qwertytoforty
1fa643484b Adds The infront of nuclear device 2021-09-11 13:37:19 -04:00
Qwertytoforty
d4462756fe Apply suggestions from code review
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-09-11 13:32:08 -04:00
Fox McCloud
a1da898f44 Merge pull request #16684 from S34NW/transparent_turf_sanity_check
Fixes runtimes in null turfs
2021-09-11 06:38:17 -04:00
S34NW
3048884b06 behone foul runtimes 2021-09-11 11:19:37 +01:00
SabreML
f1d21c8002 Gibber deconstruction fix 2021-09-11 09:28:04 +01:00
S34N
e3171f3281 Update code/modules/admin/topic.dm
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-09-11 00:45:31 +01:00
S34NW
fa09fc3a5d oh, tidy up these brackets too 2021-09-10 23:24:23 +01:00
S34NW
24176b4e00 okay we know the note ID is here somewhere 2021-09-10 23:22:01 +01:00
S34NW
ef2bd157c9 note deletion confirmation 2021-09-10 23:09:06 +01:00
S34NW
adc250cdc5 we don't need these with the istype checks 2021-09-10 22:11:03 +01:00
S34NW
0c4dcd1b62 projectiles can pass 2021-09-10 19:07:02 +01:00
variableundefined
dcad192255 Merge pull request #16627 from Deelite34/simplify-reflect-msg
Tweaks carp martial arts projectile reflection message
2021-09-09 22:29:23 -05:00
variableundefined
dab26d9f8c Merge pull request #16645 from Qwertytoforty/bump-on-a-logging-view
Puts MSAY in OOC logging view
2021-09-09 22:29:06 -05:00
variableundefined
f921d6ae7f Merge pull request #16662 from Aurorablade/KoiKoiKoiKoi
changes size of koi migration
2021-09-09 22:28:45 -05:00
variableundefined
dd3cff98ae Change "abiotic items" message to be more clear (#16545)
* Change "abiotic items" message to be more clear

* Add missing period.
2021-09-09 23:20:13 +01:00
variableundefined
f9f9c8bb08 Merge pull request #16646 from Sirryan2002/Sandwich
Adds a seperate sprite for Toasted Sandwich
2021-09-09 17:16:04 -05:00
variableundefined
b02e7f168a Merge pull request #16658 from Vi3trice/more-ai-sounds
More AI sounds - Anomalies and APC Short events
2021-09-09 17:15:24 -05:00
variableundefined
baa59c4042 Merge pull request #16654 from farie82/add_attack_log-ssd-tweak
Attack logs on SSD targets now only get the FEW loglevel if there is a user doing it
2021-09-09 17:14:59 -05:00
Qwertytoforty
21b0dfbaac Adds warning messages to admins for missing nukes 2021-09-09 15:45:13 -04:00
Aurorablade
c81e89698e I did not make a newline issue..
haha newline issues much?
2021-09-08 20:04:47 -04:00
Aurorablade
e760cc3b73 changes size of koi migration 2021-09-08 19:44:57 -04:00
AffectedArc07
3d8c6d1bd3 Removes some macro abuse 2021-09-08 20:52:24 +01:00
Vi3trice
a77fefe54b Adds a few AI sounds for anomalies, and the APC short event that ended up losing it previously 2021-09-08 10:57:16 -04:00