cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,385 Commits 26 Branches 2 Tags
adbd138595eb31dda1f0bfb89bfd442a430203bc
Commit Graph

6155 Commits

Author SHA1 Message Date
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
Crazy Lemon
35653d0cee Merge pull request #6380 from uraniummeltdown/tanksprites 
New Tank Sprites
 2017-02-14 21:32:53 -08:00
Crazy Lemon
2e6f341f70 Merge pull request #6388 from DrunkDwarf/rcd-airlock-name2 
Allows the Rapid Construction Device to set the name of a constructed Airlock
 2017-02-14 13:34:21 -08:00
Markolie
078ca5dd92 Fix examine 2017-02-13 19:30:22 +01:00
Markolie
5c177320c3 Fix remaining welding tool inhands 2017-02-13 19:26:18 +01:00
Markolie
e3eac9cdc7 Fix KA reskin mods and welding tool inhand 2017-02-13 19:12:26 +01:00
uraniummeltdown
c4dd6f533f Merge remote-tracking branch 'remotes/upstream/master' into tanksprites 
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
 2017-02-13 21:01:58 +04:00
Fox McCloud
39f5b5a5ef Merge pull request #6395 from uraniummeltdown/movetools 
Move tools into tools.dmi, RSF sprite
 2017-02-13 06:02:13 -05:00
uraniummeltdown
0e96552cf8 added back and belt sprites, double tanks use old belt sprites 2017-02-13 06:24:51 +04:00
Markolie
0aabf436db Fix ion trail effect 2017-02-11 20:33:26 +01:00
Markolie
900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
uraniummeltdown
3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
uraniummeltdown
e03981aa02 formatting tools.dm 2017-02-11 15:47:25 +04:00
uraniummeltdown
1edc9a63e8 add rsf icon+inhand from /vg/, move crowbar,cutters,screwdriver,welders,wrench,rcd,rsf to tools.dmi 2017-02-11 15:46:38 +04:00
uraniummeltdown
1bdc663053 add inhand sprites for tanks 2017-02-11 13:06:54 +04:00
Fox McCloud
04f5276047 Merge pull request #6350 from Markolie/lavaland_updates 
Add remaining Lavaland loot, kinetic accelerator refactor
 2017-02-11 00:02:42 -05:00
Crazy Lemon
cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights 
Goonlights
 2017-02-10 19:21:20 -08:00
Crazy Lemon
17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind 
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
 2017-02-10 18:27:58 -08:00
Crazy Lemon
ac69d35538 Merge pull request #6381 from Fox-McCloud/slaughter-fix 
Fixes Slaughter Demon Bloodcrawl and Demonic Whisper
 2017-02-10 17:19:54 -08:00
Brian McGillivray
c087647cce Allows RCD to set constructed Airlocks name 
Adds a new section of the Airlock menu of the Rapid Construction Device
so as to allow the user to specify the name the newly constructed
Airlock should have.
 2017-02-10 18:57:04 +00:00
Markolie
dec9bc71ac Fix music import runtime 2017-02-10 18:59:58 +01:00
Markolie
a4422a41ee Re-add anchored check 2017-02-10 18:57:57 +01:00
Markolie
b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie
c14b560ee0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-10 18:21:06 +01:00
Markolie
c93a592102 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	code/modules/shuttle/supply.dm
 2017-02-10 18:19:53 +01:00
Fox-McCloud
0ebd41b05e Fixes Slaughter Demon Bloodcrawl 2017-02-10 08:26:28 -05:00
Markolie
ed5ea305cc Add "Syndicate" prefix to Syndicate pAI card 2017-02-09 18:56:05 +01:00
Markolie
95f750d6f2 Add faction support to pAI's 2017-02-09 18:54:26 +01: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
Markolie
3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	icons/obj/objects.dmi
 2017-02-08 19:25:47 +01:00
Markolie
7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-08 19:21:57 +01: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
Crazy Lemon
2d77a0ab4d Merge pull request #6357 from Fox-McCloud/var-edit-fixes 
On Varedit Fixes
 2017-02-07 20:01:32 -08:00
Crazy Lemon
d11dfa7a3b Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy 
Refactors Reagent Tanks--Adds High Capacity Water Tank
 2017-02-07 19:58:28 -08:00
Crazy Lemon
685250501b Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor 
Monkey cube refactor
 2017-02-07 19:53:58 -08:00
Crazy Lemon
725ea4f3a7 Merge pull request #6349 from Fox-McCloud/ttv-cleanup 
Tank Transfer Valve Cleanup and In-Hands
 2017-02-07 19:51:59 -08:00
Crazy Lemon
23a43f141e Merge pull request #6329 from uraniummeltdown/mineral 
Mineral Floors
 2017-02-07 19:33:24 -08:00
Crazy Lemon
7561459cb5 Merge pull request #6296 from KasparoVy/steal-storageimp-check 
Traitor Steal Objective now Checks Storage Implants
 2017-02-07 10:05:44 -08:00
Crazy Lemon
c0ce60cc76 Merge pull request #6356 from Fox-McCloud/fixes-xeno-eggs 
Fixes Xeno Eggs and Projectiles
 2017-02-07 09:55:47 -08:00
Fox McCloud
6b10c515b1 Merge pull request #6341 from uraniummeltdown/crates 
Engineering and Science crates
 2017-02-07 09:20:57 -05:00
Fox-McCloud
ad2468196e On Varedit Fixes 2017-02-07 08:44:50 -05:00
Fox-McCloud
dc15825102 Fixes Xeno Eggs and Projectiles 2017-02-07 07:27:43 -05: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
Markolie
1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2017-02-06 20:37:03 +01:00
Markolie
7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Markolie
7bdc9a4ca7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-06 18:54:04 +01:00
uraniummeltdown
3e7dafe21a move all floor tiles to tiles.dmi, origin_tech materials=1 for base tile object, rename tranquillite tile item state 2017-02-06 21:41:39 +04:00