cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 01:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,278 Commits 26 Branches 2 Tags
1e84d34559eb61e490f28d40069285dfd17c6ff9
Commit Graph

24570 Commits

Author SHA1 Message Date
Crazy Lemon
1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools 
Goonchat Admin Filters
 2017-02-14 13:09:24 -08:00
Crazy Lemon
faa041220d Merge pull request #6439 from VampyrBytes/God-Emperor 
The God Emperor lives on!
 2017-02-14 13:09:11 -08:00
Aurorablade
321c1801bd RRRRRRRRRRRRRREEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2017-02-14 00:51:32 -05:00
Aurorablade
d461b46f91 dunno why its hcnageing lines on this 2017-02-14 00:28:58 -05:00
Aurorablade
55db3a41a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie4 2017-02-13 22:40:09 -05:00
Aurorablade
5bc07df8cb Revert "......TIGERCATTTTT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111111111111111111111111111" 
This reverts commit fdf02fc2a0.
 2017-02-13 21:44:11 -05:00
VampyrBytes
738ebac765 The God Emperor lives on! 
Fixes #6404

There were 2 issues here.
Firstly I'm guessing that UI has grown in length since this disk was
made... the UI on the disk only had a length of 24 instead of 32 which
was leading to a list out of bounds runtime. Fixed with a loop adding
0x000 to the end to prevent this happening again if the UI length
changes again

Secondly, even though it's a UI&UE disk, the dna record on it still
needed SE for it to work - Clean SE now added to it
 2017-02-13 15:03:20 +00:00
Fox McCloud
90f034b470 Merge pull request #6097 from Kyep/terrorspiders-PR2 
Terror Spiders - Part 2
 2017-02-13 06:27:32 -05:00
Fox McCloud
300751373d Merge pull request #6280 from fludd12/Grey-Wingdings 
Wingdings Revival^2
 2017-02-13 06:26:56 -05:00
Fox McCloud
b3c9912ea0 Merge pull request #6438 from Kyep/iaa_bugfix 
Fixes an IAA bug
 2017-02-13 06:25:05 -05:00
Fox McCloud
5953b527c0 Merge pull request #6398 from tigercat2000/game_pref_fix 
Fix window flashing not saving to SQL & Add error logging to log_client_to_db
 2017-02-13 06:18:20 -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
Fox McCloud
5ac10184a4 Merge pull request #6432 from Crazylemon64/kudzu_botany 
Kudzu growth now scales the correct way for quicker growth speed
 2017-02-13 05:44:02 -05:00
Crazy Lemon
ac5cb8fdf8 Merge pull request #6418 from Kyep/more_punchy 
Makes Attack Logs Punchier
 2017-02-13 00:54:04 -08: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
Crazylemon64
24e255a496 Kudzu growth now scales the correct way for quicker growth speed 2017-02-12 20:54:30 -08:00
Kyep
f8647a2108 Crazylemon spacing changes 2017-02-12 19:52:37 -08:00
Crazy Lemon
f547af48ab Merge pull request #6417 from Kyep/toxins_warning_update 
Adds area to admin canister open notices
 2017-02-12 18:47:42 -08:00
Tigercat2000
577df3de36 Add debug light source/corner/overlay instance count 2017-02-12 17:30:10 -08:00
Tigercat2000
d0f1bc0a52 Readd lighting DI info 2017-02-12 09:05:14 -08:00
uraniummeltdown
4cb4b6be82 better war dec checks, added custom war declarations from TG 2017-02-12 20:30:17 +04:00
Crazy Lemon
f6ccb2bca7 Merge pull request #6414 from Kyep/singulo_warning 
Improves singularity failure notice
 2017-02-12 05:48:05 -08:00
Crazy Lemon
50ab71760f Merge pull request #6403 from Fox-McCloud/config-change 
Tweaks Ticklag default config
 2017-02-12 05:47:25 -08:00
Kyep
60e1afbc89 Dark Gygax & Seraph mechs get precision teleporters instead 2017-02-12 05:38:45 -08:00
Kyep
a2a65b9db1 Admins now get attack logs for punches 
Right now, admins don't see attack logs for punches. They're recorded in
VV and logs, but we don't get 'ATTACK:' notices for them, even with
attack logs on.
With this PR, that changes. Now, admins with the preference enabled see
punches, too. Not disarms, just harmful punches.

We'll now be able to notice fights earlier. But, we may see a lot of
punch notices.

Admins: please use thumbs up/down on this PR according to whether or not
you want to see punches in attack logs.
 2017-02-12 04:48:10 -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
be1ae665dd Adds JMP link 2017-02-12 01:23:30 -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
952c64b1f8 Improves singularity failure notice 2017-02-11 23:08:02 -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
Fox-McCloud
1bd892e9e7 Tweaks Ticklag default config 2017-02-11 16:48:55 -05:00
Crazylemon64
6718d49af9 Fixes client varedit 2017-02-11 13:40:45 -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
Tigercat2000
f427d4315f Fix window flashing not saving to SQL & Add error logging to 
log_client_to_db
 2017-02-11 07:15:04 -08: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
Kyep
9f20cb1685 Fixes merge conflict in event_container 2017-02-10 22:07:05 -08: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
Markolie
c6559c7d9e Fix to_chat 2017-02-11 05:13:28 +01:00
Crazy Lemon
cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights 
Goonlights
 2017-02-10 19:21:20 -08:00