cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-05 05:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,294 Commits 15 Branches 2 Tags
ebe28b33720ca21bc2bfdca84dcf2fbda4d748c6
Commit Graph

3772 Commits

Author SHA1 Message Date
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
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
Markolie 900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01: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
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 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
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
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
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
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
Fox-McCloud ad2468196e On Varedit Fixes 2017-02-07 08:44:50 -05: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
Fox-McCloud e8bc6da23a Tank Transfer Valve Cleanup and In-Hands 2017-02-06 12:19:57 -05:00
Crazy Lemon cc2eceb0a3 Merge pull request #6186 from Fox-McCloud/stunprod 
Tweaks the Stunprod
 2017-02-06 05:46:26 -08:00
Fox-McCloud 249cd3279c Merge remote-tracking branch 'upstream/master' into stunprod 2017-02-06 05:35:59 -05:00
Markolie dbe1284214 Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord 2017-02-06 01:42:32 +01:00
KasparoVy ef5376ede2 conflict resolution 2017-02-05 17:13:34 -05:00
Fox-McCloud 846ce475b2 Refactors Reagent Tanks--Adds High Capacity Water Tank 2017-02-05 13:58:24 -05:00
Markolie 83cd030134 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-05 19:46:41 +01:00
uraniummeltdown 385db6d240 Merge remote-tracking branch 'remotes/upstream/master' into mineral 
# Conflicts:
#	icons/obj/items.dmi
#	icons/turf/floors.dmi
 2017-02-05 17:40:39 +04:00
Fox-McCloud 2c986259af Fixes Iconless Banana Peels 2017-02-05 06:43:14 -05:00
Fox-McCloud 390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
Crazy Lemon 01c41cfb86 Merge pull request #6081 from Markolie/lavaland_megafauna 
Ports Lavaland megafauna
 2017-02-05 00:27:40 -08:00
uraniummeltdown 5f2ef0ef7d mineral floors from TG 
group silent tiles with mineral tiles
add tile recipes
add mineral floor tile stacks and turfs
add ability to weld mineral floor tiles
 2017-02-05 10:46:24 +04:00
uraniummeltdown 7dd342743a added cargo ID skin to agent ID and ID Computer 2017-02-05 09:19:52 +04:00
Fox-McCloud f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05:00
Mark van Alphen fe62b212b4 Merge branch 'master' into lavaland_megafauna 2017-02-02 20:17:31 +01:00
Brian McGillivray 23139987a0 Tweak: Mr Chang's vending machine now refillable 
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
 2017-02-02 15:49:27 +00:00
Fox McCloud 3d587dea5b Merge pull request #6177 from uraniummeltdown/new 
Cyborg Blueprints
 2017-02-02 00:50:33 -05:00
Fox-McCloud 78a2518135 Monkey cube refactor, pre-map 2017-01-31 20:44:52 -05:00
Markolie b55394ace3 Fix resource identifiers 2017-01-31 17:45:46 +01:00
Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
uraniummeltdown 7259e4ce07 blueprints for engiborgs 2017-01-31 19:22:29 +04:00
KasparoVy 4a9f7f28f7 Traitor Steal Objective now Checks Storage Implants 
Does what it says on the tin. In assessing the completion of a steal
objective, storage implants will now be checked.
 2017-01-31 05:01:23 -05:00
Fox McCloud 0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash 
Window Flashing
 2017-01-31 01:30:39 -05:00