cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-21 15:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,333 Commits 28 Branches 2 Tags
f0295c03cd9eecdfdff724dc193139133535a701
Commit Graph

34182 Commits

Author SHA1 Message Date
Fox McCloud
f0295c03cd Merge pull request #13050 from Mitchs98/kravmaga 
Adds logs for Krav Maga and Carp.
 2020-03-14 15:24:33 -04:00
Fox McCloud
9d678f42af Merge pull request #13066 from Quantum-M/gameBooks 
SOP Books now read the SOP on the wiki and has new sprites
 2020-03-14 15:23:11 -04:00
Fox McCloud
98b5a8014f Merge pull request #13028 from farie82/barrier-walking 
Walking through barriers now also lets a dragged carbon get through
 2020-03-14 15:11:40 -04:00
Fox McCloud
3df642ffa4 Merge pull request #12678 from Kyep/depot_loot_fix 
Fixes 12677 - depot self-destruct leaves loot behind
 2020-03-14 15:03:09 -04:00
Fox McCloud
e26ed2db55 Merge pull request #13118 from farie82/recharger-fix 
Cyborg recharger now throws occupants out when destroyed and heals IPCs even when they are not hungry
 2020-03-14 15:01:51 -04:00
farie82
ca8d9c7c95 Update rechargestation.dm 2020-03-14 19:49:21 +01:00
Fox McCloud
c6767b2c42 Merge pull request #13085 from SteelSlayer/drone-no-flash 
Maintenance drones no longer get a flash
 2020-03-14 14:21:58 -04:00
Fox McCloud
c48ad34c2d Merge pull request #13061 from Quantum-M/aiLockerCheese 
AI Cores are no longer able to fit in a locker
 2020-03-14 14:19:41 -04:00
joep van der velden
6459163418 Recharger fixes 2020-03-14 15:37:52 +01:00
Patrick Meade
54f538307c Panic bunker threshold is configurable (#13080) 
* Panic bunker threshold is configurable

* Cleaned up bunker automation logic, added admin control verb

* Changed Set Server Capacity to two toggle verbs; modified logic

* Revert "Changed Set Server Capacity to two toggle verbs; modified logic"

This reverts commit 398a8615a5.

* Revert "Cleaned up bunker automation logic, added admin control verb"

This reverts commit b6a6d49714.
 2020-03-12 01:24:16 -06:00
Bryan
34d214cbb3 Requested Changes 2020-03-09 10:22:59 -07:00
Fox McCloud
47263ded27 Merge remote-tracking branch 'upstream/master' into cig-tweaks 2020-03-08 22:35:49 -04:00
variableundefined
edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd 
Adds CBD
 2020-03-08 21:46:20 -04:00
farie82
761ada255b Update holosign.dm 2020-03-08 08:53:50 +01:00
variableundefined
5ba0426618 Merge pull request #13074 from Fox-McCloud/camera-nope 
Removes Creatable Video Cameras
 2020-03-08 03:46:32 -04:00
variableundefined
5f6e9f8cb2 Merge pull request #13007 from TheSardele/log-change 
Adds a log for admins
 2020-03-08 03:43:52 -04:00
variableundefined
d8a934381c Merge pull request #12854 from Darkmight9/ERT_and_Dsquad_bag_space 
Increases bag space of ERTs and death squads
 2020-03-08 03:34:23 -04:00
Fox McCloud
29f571dfc7 Merge pull request #13069 from Aquilar/blueshieldbackpacksforrobbie 
new blueshield backpacks (sprites by Rapaskoti)
 2020-03-08 03:33:54 -04:00
variableundefined
bd4019a494 Merge pull request #12848 from Arvenius169/spellingfix 
Fixes a Minor Spelling Error In Busy Space
 2020-03-08 03:32:43 -04:00
Fox McCloud
05cb278235 Merge pull request #13026 from AzuleUtama/chamflagIllegals 
Lowers illegal tech level of chameleon flag
 2020-03-08 03:32:28 -04:00
Fox McCloud
42eb7fb4c4 Merge pull request #12875 from Aquilar/naniteoversightfix 
Making Nanites also fix internal bleeding.
 2020-03-08 03:32:04 -04:00
variableundefined
c257d2d41d Merge pull request #12823 from Superhats/PlasmaDust 
Plasma dust now heals plasmamen
 2020-03-08 03:31:18 -04:00
Fox McCloud
4659e3ec19 Merge pull request #12815 from datlo/honkhonkhonk 
Clowns learns clownish on spawn
 2020-03-08 03:29:51 -04:00
Fox McCloud
ef439c29df Merge pull request #12813 from farie82/itemslot-pixelfuckery 
Clicking item slot now clicks the item in it [PORT]
 2020-03-08 03:29:41 -04:00
Kyep
7b06d2c2ea Merge remote-tracking branch 'ParadiseSS13/master' into depot_loot_fix 2020-03-07 23:25:20 -08:00
Kyep
394aff3a73 removes E.Destroy() 2020-03-07 23:25:06 -08:00
variableundefined
5f8614e7d9 Merge pull request #12801 from Cazdon/pylonWallFix 
Pylons now create artificer cult walls instead of real cult walls.
 2020-03-08 00:05:34 -05:00
variableundefined
92f0df43bd Merge pull request #13043 from farie82/spoder-runtime-logging 
Terrors spiders can now spawn again. Logs the corrupt vent and continues
 2020-03-07 23:46:25 -05:00
Fox McCloud
dde970a6bd Merge pull request #12841 from Arvenius169/spacetempfix 
Space Temperature Implementation
 2020-03-07 19:04:04 -05:00
Fox McCloud
19a7db3e47 Merge pull request #12682 from moxian/abductor-linebreak 
Add missing linebreaks to abductor endscreen report.
 2020-03-07 18:54:42 -05:00
Fox McCloud
37cc564a1e Merge pull request #12704 from moxian/paper-uid 
Make paperwork popups use UID as a window id.
 2020-03-07 18:50:54 -05:00
Fox McCloud
f496c73988 Merge pull request #12694 from TheSardele/slime-log 
Logs slime attacks correctly
 2020-03-07 18:43:35 -05:00
Fox McCloud
df2c35d4c1 Merge pull request #12698 from moxian/colorblind-photo 
Make photos look the same as reality to colorblind people.
 2020-03-07 18:42:39 -05:00
Fox McCloud
47fec9a889 Merge pull request #12921 from Qwertytoforty/master 
Allows vox to drink synthanol without throwing up
 2020-03-07 18:40:04 -05:00
Fox McCloud
b3e840916a Merge pull request #13042 from Ty-Omaha/shuttle-computer 
Fixes nukie shuttle computer being destructible & others
 2020-03-07 18:18:55 -05:00
Fox McCloud
70d7d64397 Merge pull request #13030 from AffectedArc07/extools-debugger 
Adds extools debugger support
 2020-03-07 18:16:19 -05:00
Fox McCloud
1f4cc7c75f clean up 2020-03-07 17:41:17 -05:00
farie82
a14b9fbbc7 disabled SSchat till it's fixed (#13088) 2020-03-07 13:42:39 -07:00
SteelSlayer
a51fe90711 Turns on the chat subsystem (#13084) 
* Turns on the chat subsystem

* some code improvements

* payload -= i

* this is the same thing

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
 2020-03-07 12:04:07 -07:00
Patrick Meade
52c43862b2 Traders on Red Alert spawns another event (#13078) 2020-03-07 12:03:47 -07:00
Fox McCloud
4d9c89bdc0 menthol 2020-03-06 23:48:32 -05:00
SteelSlayer
b45a4fc996 spelling 2020-03-06 20:37:20 -06:00
SteelSlayer
894c326725 add_default_robot_items() 2020-03-06 20:35:55 -06:00
Mitchell
3dab40eba4 Fixes attack logs 2020-03-06 16:38:31 -06:00
SteelSlayer
1b74dc915f no flash 2020-03-06 13:29:47 -06:00
Kyep
49bdfbf3f0 Fixes #13070 - cyborg energy guns breaking (#13071) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-03-05 22:35:02 -07:00
Tayyyyyyy
adf908e855 Fix global narrate not using admin pencode (#13067) 2020-03-05 22:26:20 -07:00
variableundefined
073fefd856 Merge pull request #12843 from farie82/antidrop-implant-fix 
Anti drop implants now don't break shit when EMPed
 2020-03-05 18:32:07 -05:00
variableundefined
f54bcf8ee9 Merge pull request #13073 from Kyep/cyborg_gun_double_charging_fix 
Fixes cyborg energy weapons costing twice as much as intended
 2020-03-05 18:30:51 -05:00
variableundefined
7147e51a18 Merge pull request #12645 from Citinited/pa-radiation-fix 
Makes the particle accelerator dangerous
 2020-03-05 18:27:45 -05:00