Commit Graph

5551 Commits

Author SHA1 Message Date
Kugamo
e0a7889e75 Adds inhand sprites, makes naming more consistant 2020-09-02 05:49:05 -05:00
AffectedArc07
75bbf7a6d5 Merge pull request #14088 from kugamo/Inhand-sprites-for-cigarette-packets
Inhand sprites for cigarette packets
2020-09-02 11:04:41 +01:00
AffectedArc07
b00304ebf1 Merge pull request #14209 from denghis1/plastic_create_cone
Feature: Make warning cone craftable
2020-09-02 11:00:51 +01:00
AffectedArc07
35682a8e20 Merge pull request #14210 from RedWolfie/crayon
[Bugfix] Orange cables
2020-09-02 11:00:23 +01:00
Certhic
916d358ad3 replaced some magic values 2020-09-01 16:26:25 +02:00
Certhic
90ac9874b2 fixed orange crayons not making cables orange 2020-09-01 16:23:53 +02:00
denghis1
7705a8c01a Removed the crafting time of the warning cones
Removed the crafting time of the warning cones, since it was so low anyway.
2020-09-01 16:07:49 +02:00
denghis1
451f1548a9 Made warning cones craftable
Added warning cones to the global plastic_recipies list, this makes them craftable in-game.
2020-09-01 15:54:29 +02:00
variableundefined
c8c1800b57 Merge pull request #13943 from AffectedArc07/more-tcomms-tweaks
*more* Tcomms Tweaks
2020-08-31 16:05:05 -04:00
Kugamo
da45849334 splits up if statement into multiple lines 2020-08-30 15:43:23 -05:00
Kugamo
c340e71999 ok this is the best solution
A single if statement, how elegant
2020-08-29 19:07:55 -05:00
Kugamo
702fbbfdb3 this is acutally is a better fix
my first commit didnt account for the possibility that the revealed item could be destroyed, this way also eliminates another if statement. BUT it still goes through the full cycle for the objects(they still appear translucent for a time)
2020-08-29 19:03:27 -05:00
Kugamo
811dd2c454 fix 2020-08-29 18:31:21 -05:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor
TG Flying+Floating Refactor
2020-08-27 20:08:35 +01:00
AffectedArc07
3fb3353bc8 Merge pull request #14068 from ExusA/Spray-Fix
Hydroponics Spray Fix
2020-08-19 11:18:33 +01:00
ExusA
c1756fe7e3 Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-08-19 18:09:13 +08:00
AffectedArc07
ce0eb1fbdc Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order
Fix colored lips drawing over masks and random lipstick colouring
2020-08-19 10:46:04 +01:00
mochi
346b54ad26 Fix random lipstick colour always defaulting to white 2020-08-19 10:20:14 +02:00
ExusA
9f62b5534b fixes indentation and duplicate code 2020-08-18 22:21:25 +08:00
AffectedArc07
5037e43341 Merge pull request #14073 from ExusA/toy-descs
Adds Figurine Descriptions
2020-08-18 13:01:34 +01:00
AffectedArc07
233c60058d Merge pull request #13710 from dearmochi/overhaul-event-mob-selection
Overhaul event mob selection
2020-08-18 10:55:24 +01:00
AffectedArc07
69cd58c1df Merge pull request #13934 from SabreML/Maint-Drone-Stuff
Maintenance Drone Tweaks
2020-08-17 13:35:59 +01:00
AffectedArc07
2d1ba4ab56 Merge pull request #14005 from dearmochi/baton-refactor
Telebaton fix, refactor and documentation
2020-08-16 20:08:33 +01:00
AffectedArc07
f65e8f1d7f Merge pull request #13899 from dearmochi/flashbang-light-vfx
Update flashbang FX and code clean-up
2020-08-16 20:00:48 +01:00
ExusA
f0dc996149 Update belt.dm 2020-08-16 23:50:30 +08:00
ExusA
9401458416 actually what i meant to submit 2020-08-16 21:53:46 +08:00
AffectedArc07
07301da5d2 Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob
ID Computer Demotion/Termination Upgrades
2020-08-16 13:14:42 +01:00
Kugamo
40f5e0ecd6 references the new sprites 2020-08-15 23:07:10 -05:00
Kugamo
d7a479e879 Adds many inhand sprites for cigpacks and animates lighers 2020-08-15 23:06:37 -05:00
ExusA
abbb1e05fb Update toys.dm 2020-08-13 16:16:36 +08:00
ExusA
addb0c1a26 Update belt.dm 2020-08-13 15:00:49 +08:00
ExusA
f61d92ef0e Merge branch 'master' into Spray-Fix 2020-08-13 14:46:16 +08:00
ExusA
0f95e7308f Revert "Fixes hydro sprays"
This reverts commit 266939684f.
2020-08-12 23:21:20 +08:00
ExusA
ee65493c3f Update sheet_types.dm 2020-08-12 23:20:48 +08:00
ExusA
51c63c64c3 Update belt.dm 2020-08-12 20:17:21 +08:00
ExusA
266939684f Fixes hydro sprays 2020-08-12 20:09:53 +08:00
mochi
96bf4396a0 Merge branch 'master' into overhaul-event-mob-selection 2020-08-12 01:22:52 +02:00
AffectedArc07
0aa89bd3de Merge pull request #13748 from Fox-McCloud/rig-purge
Purges Rigs
2020-08-09 18:21:39 +01:00
AffectedArc07
601a5db433 Merge pull request #13378 from Fox-McCloud/applicator-tweaks
Applicator QoL Tweaks
2020-08-08 16:53:18 +01:00
AffectedArc07
fcd6f900b9 Merge pull request #13175 from farie82/logging-improvements
Logging view improvements
2020-08-08 16:23:06 +01:00
mochi
038bb7a3a6 Merge branch 'master' into fix-stuff 2020-08-07 10:07:18 +02:00
mochi
5720b0b8b2 Clean up code and make telebaton verbs static 2020-08-06 21:54:56 +02:00
mochi
b9e44c869e Baton knockdown animation, refactor & doc 2020-08-03 22:38:16 +02:00
mochi
1bf16ee40c Update flashbang FX and code clean-up 2020-08-03 19:50:58 +02:00
Kyep
7c9019d74b Merge remote-tracking branch 'ParadiseSS13/master' into id_computer_demote_terminate_freejob 2020-08-01 17:39:30 -07:00
AffectedArc07
debcf5dad0 Replaces all "var " with "var/" 2020-07-29 10:06:00 +01:00
AffectedArc07
56d2f833b3 Lets fix verbage while we are at it 2020-07-28 20:46:09 +01:00
SabreML
4f05dc2354 Update lightreplacer.dm 2020-07-27 03:38:52 +01:00
SabreML
7da32e28ba Fixes light replacer grammar. 2020-07-27 03:32:37 +01:00
Fox McCloud
a174b632fc Merge pull request #13905 from AffectedArc07/book-drm
Adds book DRM
2020-07-25 20:07:01 -04:00