Couls
1f3762facb
Use add timer instead of a spawn
2019-08-27 20:11:29 -04:00
Couls
977433af5f
Merge remote-tracking branch 'upstream/master' into dual-wielding
2019-08-27 20:11:08 -04:00
variableundefined
f9e348b735
Merge pull request #12095 from Ionward/Drask-Shoes-Uniform
...
Drask shoe sprite fix and uniform fixes
2019-08-26 20:20:21 -04:00
variableundefined
33804e27c2
Merge pull request #12098 from Fox-McCloud/WHY-WHY-WHYYYYYYYYYYYYYYYYYYYYYYY
...
WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?!
2019-08-26 19:06:05 -04:00
Fox McCloud
cd4734e047
Merge pull request #12088 from Shadow-Quill/OOC-Admemery
...
Prevents OOCing after OOC is disabled
2019-08-26 19:05:55 -04:00
Fox McCloud
727be7d03f
WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?!
2019-08-26 18:23:09 -04:00
Ionward
26d836f70f
drask shoe sprites enabled, added sprites, and fixed minor issues noticed in uniforms
2019-08-26 13:50:49 -07:00
variableundefined
97654f5d52
Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
...
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00
variableundefined
ed157b56e3
Merge pull request #11868 from SteelSlayer/smes-fix
...
Fixes bugs/exploits related to SMES. Reorganizes parts of the SMES file
2019-08-26 08:43:02 -04:00
variableundefined
e702c2ef53
Merge pull request #11797 from Couls/blood-changes
...
Blood is now less annoying
2019-08-26 06:41:39 -04:00
variableundefined
289b890e76
Merge pull request #12087 from KasparoVy/skrekked_myself_up
...
Fixes Bug with Species-fitted Inhand Icons
2019-08-26 06:40:35 -04:00
variableundefined
872837a691
Merge pull request #12094 from Fox-McCloud/plasmaman-atmos-tech-fix
...
Fixes Plasmamen Atmos Techs Not Getting Proper Suit
2019-08-26 06:39:49 -04:00
Fox McCloud
a1c07f20b6
Fixes Plasmamen Atmos Techs Not Getting Proper Suit
2019-08-26 06:16:39 -04:00
Fox McCloud
3140255fc8
Reverts "Fixes Grid Check"
2019-08-26 00:44:46 -04:00
Shadow-Quill
7330da094c
Prevents OOC Memeing
2019-08-25 21:39:18 -05:00
Couls
dfe9752da7
Merge remote-tracking branch 'upstream/master' into blood-changes
2019-08-25 22:37:25 -04:00
KasparoVy
285df0d994
Fixes Inhand Sprite Sheeting Bug
...
Caused by #11978 , the bug presented where a species that was in the sprite_sheets of an item but didn't have a custom inhand item for it picked up an item like a uniform and suddenly a grey jumpsuit was rendered on them. Happened for Vox when picking up regular uniforms because they have species-specific uniform sprites but not species-specific inhands, so it triggered the conditional and caused silly issues.
2019-08-25 22:29:16 -04:00
variableundefined
52b7d04d02
Merge pull request #11921 from Couls/TG-chat-subsystem
...
Port TG's chat subsystem
2019-08-25 22:26:33 -04:00
Couls
a42f638b73
spessing
2019-08-25 22:22:05 -04:00
variableundefined
cb3cb84f23
Merge pull request #12037 from Couls/buckle-your-pants
...
Mining shuttle launch delay and warning message
2019-08-25 21:43:17 -04:00
variableundefined
320a63288b
Merge pull request #12086 from Fox-McCloud/fix-plasmaman-karma-displayed
...
Fixes Plasmaman Karma Displayed Cost
2019-08-25 19:08:13 -04:00
variableundefined
8dce28d3e5
Merge pull request #12073 from Fox-McCloud/hardsuit-helmet
...
Hardsuit helmet
2019-08-25 19:06:37 -04:00
Fox McCloud
cedbaaa80d
Fixes Plasmaman Karma Displayed Cost
2019-08-25 18:49:11 -04:00
Fox McCloud
b441ae1c8f
Merge pull request #12080 from SteelSlayer/L6-fix
...
Fixes a bug that prevented you from inserting L6 SAW magazines into the gun
2019-08-25 18:40:19 -04:00
variableundefined
634f916301
Merge pull request #12064 from Fox-McCloud/food-candy-sprites
...
Updates Food and Candy Sprites
2019-08-25 18:33:04 -04:00
Fox McCloud
f694b483cf
include new outfit data
2019-08-25 18:25:52 -04:00
Fox McCloud
9a4834a565
Merge remote-tracking branch 'upstream/master' into hardsuit-helmet
2019-08-25 18:15:10 -04:00
Fox McCloud
812b3b3ccd
woops.
2019-08-25 17:48:15 -04:00
Fox McCloud
c95067217c
Merge remote-tracking branch 'upstream/master' into plasmamen-rework
2019-08-25 17:43:34 -04:00
Fox McCloud
dd346515e5
additional suits
2019-08-25 17:42:48 -04:00
variableundefined
9facf36ec2
Merge pull request #12038 from Shadow-Quill/AI-APC-Fix
...
Fixes APC menus not opening after the powerloss hack
2019-08-25 17:38:00 -04:00
variableundefined
8269bc525e
Merge pull request #11941 from farie82/examine-info
...
Adds tips to certain things + general fixes that for issues I across
2019-08-25 16:53:49 -04:00
Fox McCloud
85c6997584
Merge remote-tracking branch 'upstream/master' into plasmamen-rework
...
# Conflicts:
# code/modules/mob/living/carbon/human/update_icons.dm
# icons/obj/device.dmi
# paradise.dme
2019-08-25 16:51:21 -04:00
variableundefined
213e36c1ad
Merge pull request #12066 from Fox-McCloud/lavaland-reorganization
...
Re-organizes Lavaland Files; Makes some Balance tweaks
2019-08-25 16:39:30 -04:00
variableundefined
9a29a171f3
Merge pull request #11948 from Emanthealmighty/Playerinteractionblob
...
Blobbernaut major changes (player control!)
2019-08-25 16:39:07 -04:00
Eman
3d3af66be2
Blobbernauts now lose health if they are not at max health outside of blob structures.
2019-08-25 22:24:20 +02:00
Fox McCloud
855c8b3a98
derp
2019-08-25 15:18:07 -04:00
Shadow-Quill
371dc95b8f
Update life.dm
...
LET THERE NOT BE SRCs!
2019-08-25 12:30:49 -05:00
SteelSlayer
a2dc9aa6f8
removes implicit src
2019-08-25 09:04:27 -04:00
SteelSlayer
2dbc09f734
who said you could move? get back there
2019-08-25 08:48:20 -04:00
variableundefined
28980c0b79
Merge pull request #11862 from Ty-Omaha/grid-check-fix
...
Fixes Grid Check
2019-08-25 06:37:22 -04:00
variableundefined
3764581cc5
Merge pull request #12079 from Fox-McCloud/fixes-stuns
...
Fixes Stuns
2019-08-25 05:11:00 -04:00
Fox McCloud
c66c6a5e30
Merge pull request #12081 from farie82/fix-implants
...
Implants now work again
2019-08-25 03:22:45 -04:00
joep van der velden
ab155d4ca4
Implants now work again
2019-08-25 08:59:36 +02:00
Fox McCloud
7867bd8b71
Fixes Stuns
2019-08-25 01:36:40 -04:00
SteelSlayer
205b36feca
Fixes not being able to insert mags into the L6 SAW
2019-08-25 01:20:31 -04:00
Fox McCloud
4c6651fa72
fixes
2019-08-24 20:13:09 -04:00
Fox McCloud
66089849a5
fix
2019-08-24 18:48:08 -04:00
Fox McCloud
cb6df7092c
Hardsuit Helmets Integration
2019-08-24 18:36:27 -04:00
Tayyyyyyy
d6b85396c2
Fix parallax null turf runtime
2019-08-24 11:53:06 -07:00
