cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,269 Commits 28 Branches 2 Tags
39ccbbb0221f910dbba8280bef02f04e80197e9c
Commit Graph

13101 Commits

Author SHA1 Message Date
Kyep
7c6d08b4bf PR 3, you are go for launch 2017-02-14 00:59:17 -08:00
Fox McCloud
b3c9912ea0 Merge pull request #6438 from Kyep/iaa_bugfix 
Fixes an IAA bug
 2017-02-13 06:25:05 -05:00
Kyep
d60c060758 Fixes an IAA bug 
Fixes a missing definition that was meant to be added in
https://github.com/ParadiseSS13/Paradise/pull/6412
 2017-02-13 03:18:19 -08:00
Fox McCloud
69eae328d3 Merge pull request #6386 from uraniummeltdown/nukedeclaration 
Custom War Declaration
 2017-02-13 06:12:31 -05:00
Fox McCloud
d293666275 Merge pull request #6415 from Kyep/ert_playerpanelnew_fix 
ERT PPN Fix
 2017-02-13 06:04:16 -05: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
Crazy Lemon
ae26ca3de2 Merge pull request #6412 from Kyep/playtime_req_update 
Tweaks some playtime requirements
 2017-02-13 00:12:33 -08:00
Crazy Lemon
00ed6cd1bd Merge pull request #6367 from Markolie/fixxxxx 
Fixes
 2017-02-13 00:09:46 -08:00
Crazy Lemon
be15d2656e Merge pull request #6416 from Kyep/rebalance_mech_teleporter 
Nerfs mech mounted teleporters
 2017-02-13 00:08:53 -08:00
uraniummeltdown
4cb4b6be82 better war dec checks, added custom war declarations from TG 2017-02-12 20:30:17 +04:00
Kyep
60e1afbc89 Dark Gygax & Seraph mechs get precision teleporters instead 2017-02-12 05:38:45 -08:00
Kyep
a9c59e8b8d Adds area to admin canister open notices 
Modifies the "X opened a canister that contains <gas>" notice for
admins. Add the area the canister was opened in.

Reason: someone opening a toxins canister in toxins is not a big deal.
Someone opening one in central primary is. With this PR, admins can tell
the difference without having to go look at the canister.
 2017-02-12 03:56:18 -08:00
Kyep
86cb8d14d1 Nerfs mech mounted teleporters 
Changes:
- Mech mounted teleporters now use 8000 power on use (previously, did
not appear to use any)
- With a 40,000 capacity bluespace cell, this gives them 4-5 uses of the
bluespace cell before their battery drains.
- This also affects the CC seraph and Syndi Dark Gygax mechs. They've
been retrofitted with bluespace cells also to handle the extra power
drain.
- With these changes, mech-mounted teleporters are still buildable (with
LOTS of R&D) and still useful, but you can no longer spam them to
teleport across the station uncatchably fast.
 2017-02-11 23:59:06 -08:00
Kyep
53f00eabc8 ERT PPN Fix 
Makes ERT members show up correctly in Player Panel New.

IE: "Major Tom (ERT Security)" instead of "Major Tom ()".

No CL as it is admin-only.
 2017-02-11 23:20:21 -08:00
Kyep
7172545e62 Tweaks some playtime requirements 
Changes:
- IAA now requires 5 hours
- Captain and AI now require 20 hours
 2017-02-11 22:08:31 -08: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
Fox McCloud
d875475097 Merge pull request #6393 from VampyrBytes/spell-drop-fixes 
Fixes #6292
 2017-02-11 14:27:28 -05: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
VampyrBytes
777a6f02f5 Fixes #6292 
If spells somehow get dropped they will now delete

fixes #6292
continues #6306
 2017-02-11 07:07:39 +00: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
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
73f314d150 Fix encoding of goon_disabilities 2017-02-10 18:22:06 +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
a1cc763080 fixes slaughter whisper 2017-02-10 12:18:08 -05:00
Fox-McCloud
0ebd41b05e Fixes Slaughter Demon Bloodcrawl 2017-02-10 08:26:28 -05:00
Fox McCloud
795fda7874 Merge pull request #6366 from uraniummeltdown/quantumpads 
Quantum Pads
 2017-02-10 07:28:27 -05:00
uraniummeltdown
705ff0b398 made requested changes 2017-02-10 16:20:46 +04: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
8e0f2092ea Fix compile issue 2017-02-08 21:46:42 +01:00
Markolie
3ab8f939ac Fix broken genetics spells 2017-02-08 21:41:31 +01:00
uraniummeltdown
60bb4fd5bc ported quantum pads from TG and added to RnD 2017-02-09 00:33:07 +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
Fox McCloud
b35eb8e96f Merge pull request #6086 from tigercat2000/shuttle_hijack 
Hijacking a shuttle diverts it to the syndicate outpost
 2017-02-08 10:05:34 -05:00
Crazy Lemon
fbbec4234c Merge pull request #6294 from Kyep/holograms_move 
Enables AI holograms to move between holopads
 2017-02-07 20:05:19 -08: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