Crazy Lemon
e89bbcd9c1
Merge pull request #6330 from FlimFlamm/box_sprite_addition
...
Large Cardboard Box Decals/Sprites
2017-02-14 23:12:41 -08:00
uraniummeltdown
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
FlimFlamm
ebed2adc55
This commit updates the name of the new "cardboard_boxes.dmi" file (from boxes.dmi) to prevent future confusion with regular boxes.
2017-02-09 02:08:41 -04:00
FlimFlamm
c14cab9a69
This commit changes the re-sprite mechanic to use a pen instead of crayonbox (as per the convention pointed out by Fox). Removes no longer needed contents checks and re-orders incapacitation check.
2017-02-08 15:12:56 -04:00
FlimFlamm
2abbbc7a40
This commit removes the loop used to check contents and instead uses W.contents.len in order to compare the ccurrent number of items in the crayon box against it's max storage capacity (6) to ensure the crayon box is full. Also better usage of returns in order to preserve indentation on code and make it more readable.
2017-02-08 10:08:07 -04:00
FlimFlamm
47427c5aec
This commit adds checks to make sure the box is filled with 6 crayons (of any subtype) before the input selection window is presented, and after a choice is made (to prevent people using crayon-less boxes)
2017-02-08 00:26:26 -04:00
FlimFlamm
6ede4c9ef8
This commit improves again the legibility of the list of decal options presented to the user, fixes a minor syntactical error involving ampersands, and deletes superfluous returns at the end of attackby proc.
2017-02-07 03:22:29 -04:00
FlimFlamm
25f5df4ba3
This commit adds adjacency check, item-still-in-hands check, now properly handles null input, and consumes the crayon box upon completion. Everything compiles, and everything works on local environment.
2017-02-06 22:04:36 -04:00
FlimFlamm
4666222ab5
This commit adds a cancel option to the decal selection list and spruces up the names to make them more legible
2017-02-05 23:24:50 -04:00
uraniummeltdown
6f774c8e1e
added engi+engisec, electric engi from TG and sci+scisec crates from /vg/
2017-02-05 19:22:07 +04:00
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
FlimFlamm
d01e4c3023
readds a forward slash which was removed in error
2017-02-04 21:51:22 -04:00
FlimFlamm
7432e80d51
This commit modifies cardboardbox.dm in order to have boxes pull sprites from the ew DMI file, and also to trigger the re-spriting option when open boxes are struck with a box of crayons.
2017-02-04 16:25:42 -04:00
Mark van Alphen
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
Chakirski
f39fe8ab75
muh future
2017-02-01 21:29:04 -06:00
Chakirski
812c2db2fe
closets
2017-01-31 19:14:31 -06:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Markolie
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Crazylemon64
c0cd2c263f
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Fox McCloud
f205f5f040
Merge pull request #5915 from Twinmold93/runtime_fixer_t2
...
Spacepod and Some Runtime Fixes
2016-12-01 10:15:51 -05:00
Twinmold
ada80ec529
Pod Fixes and Some Runtime Fixes
...
Fixes sending pod pilots to the void when the pod explodes/is destroyed,
as well as giving them damage warnings, just like passengers get. Also
fixes it so if a guardian traps something, then dies, doesn't runtime.
Lastly, fixes it so there isn't a randomly runtime from opening a
critter crate, as well as cleaning up a little snowflake code, thanks to
Crazylemon.
2016-11-26 05:37:31 -06:00
TullyBurnalot
1955f86383
Fax Guide Removal
...
- Removes Fax Guides from HoS and HoP Lockers
2016-11-12 01:59:21 +00:00
Markolie
0fa43f7f41
Hopefully final magic fixes, and fixes the possessor
2016-10-25 23:32:35 +02:00
uraniummeltdown
aac3fa245d
added absolute paths
2016-09-03 09:15:30 +04:00
uraniummeltdown
92fc9d79f4
removed access requirements
2016-09-02 08:24:21 +04:00
uraniummeltdown
7eac0d4d8a
added mime and clown lockers to code, added sprites
2016-09-01 21:43:49 +04:00
Crazylemon64
05ebb18b3d
Fixes a closet runtime
2016-08-22 22:14:31 -07:00
Isaac Erwin
8b9b28a3c5
Fixes welded fireclosets not showing up properly
2016-08-13 13:14:30 -04:00
TheDZD
6d280e52de
Merge pull request #5375 from Fox-McCloud/formal-captain
...
Formal Captain Update
2016-08-10 18:12:09 -04:00
Fox-McCloud
989b629de4
crown and shoes
2016-08-08 19:36:41 -04:00
Fox-McCloud
0694a35da4
Formal Captain Update
2016-08-08 19:01:37 -04:00
Crazylemon64
7db4094a38
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-03 13:31:42 -07:00
Crazylemon64
6ca037d9f4
Makes things more consistent
2016-08-02 11:27:28 -07:00
Fox McCloud
9ffc341f49
Merge pull request #5274 from TheBeoni/Coats
...
Removes the obligatory tie from Blueshields and Detectives coat.
2016-08-02 13:48:13 -04:00
Fox McCloud
db066016b2
Merge pull request #5273 from LittleBigKid2000/mourning-wood
...
Fixes wooden coffins deconstructing into metal sheets
2016-08-02 12:56:33 -04:00
Fox McCloud
dbd1cdb35a
Merge pull request #5269 from GeneralChaos81/AtmosLockers
...
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
2016-08-02 12:55:54 -04:00
Isaac Erwin
692e961e2f
Fixes wooden coffins deconstructing into metal sheets
...
Sure, I /could/ fix the messages and the fact that a wooden coffin is
deconstructed with a welder, but just think of it as slicing the hinges
apart because I'm too lazy.
Also makes sarcophaguses deconstruct into sandstone, but I don't think
I've ever seen those in-game.
🆑
fix: Coffins will now deconstruct into wood instead of metal.
/🆑
2016-08-01 23:05:50 -04:00
Crazylemon64
bc93078da5
Merge conflicts begone
2016-08-01 18:28:47 -07:00
TheDZD
0cc2051f8a
Merge pull request #5251 from Fox-McCloud/fire-system
...
Implements Fire System
2016-08-01 19:39:50 -04:00
TheBeoni
67836ab234
Adds black tie to detectives locker.
2016-08-01 22:12:16 +02:00
GeneralChaos81
7c7d63b05f
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
2016-08-01 16:25:50 +10:00
Crazylemon64
bf2bcbce67
Removes most hard-coded z level checks
2016-07-31 21:29:03 -07:00
Crazylemon64
ae43de3652
Integrates the z level manager with the space transition system
2016-07-29 19:11:36 -07:00
Fox-McCloud
bde5755916
Implements Fire System
2016-07-29 13:24:09 -04:00
TheDZD
6d095d50f5
Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued
...
More Reagent Refactoring and Cleanup
2016-07-21 10:12:14 -04:00
Fox-McCloud
00a470fd6d
removes stupid sdisabilities
2016-07-21 02:24:54 -04:00
Fox-McCloud
a58c85941b
More Reagent Refactoring
2016-07-19 14:06:41 -04:00
Fox-McCloud
e6c02e3a2c
Merge remote-tracking branch 'upstream/master' into mining-tweaks
2016-07-15 23:16:00 -04:00
