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

34220 Commits

Author SHA1 Message Date
Fox McCloud
c167bbd52d Merge pull request #12644 from datlo/hisgraceimprovement 
Make His Grace simpler to link with
 2020-03-14 15:58:58 -04:00
Fox McCloud
f188142018 Merge pull request #12673 from Citinited/snow-machine-order-tweak 
Snow machine can be ordered on both cargo consoles, not just the supply console
 2020-03-14 15:57:08 -04:00
Fox McCloud
7869850103 Merge pull request #12814 from farie82/airlock-note-qol 
Removing a note from an airlock now puts it in your hands and talismans don't go on airlocks anymore
 2020-03-14 15:54:50 -04:00
Fox McCloud
e5c1d9767f Merge pull request #12830 from SteelSlayer/holopara-cancel 
Adds a confirmation message to guardian creating items; Allows users to cancel using them
 2020-03-14 15:50:51 -04:00
Fox McCloud
64440fd8de Merge pull request #12855 from SteelSlayer/cyberfloor 
Adds circuit flooring to the floor painter
 2020-03-14 15:46:56 -04:00
Fox McCloud
38d1172a79 Merge pull request #12897 from farie82/fix-antag-civ-prefs 
Antags that have their job unavailable will now spawn according to their preferences
 2020-03-14 15:43:42 -04:00
Fox McCloud
af26b704a2 Merge pull request #12895 from farie82/more-descriptive-offer-ghost 
Adds the job and antag status to the offer to ghost question
 2020-03-14 15:42:26 -04:00
Fox McCloud
a400e8b1c8 Merge pull request #12896 from farie82/clingvampagent-fix 
Vamps and cling on agent + cling/vamp rounds will spawn now
 2020-03-14 15:41:37 -04:00
Fox McCloud
c8b6b26428 Merge pull request #12902 from Cazdon/wizardEnd 
Wizard Apprentices pass the IsWizard check. Wizard rounds end when all Wizards and Apprentices are dead.
 2020-03-14 15:40:09 -04:00
Fox McCloud
c8ebf90620 Merge pull request #12911 from Ty-Omaha/malf-ai2 
Makes traitor AIs always malf
 2020-03-14 15:36:22 -04:00
Fox McCloud
baa80035b0 Merge pull request #12924 from farie82/queen-spit-block 
Terror queen spit is now blockable
 2020-03-14 15:34:29 -04:00
Fox McCloud
8ce3b1da16 Merge pull request #12932 from AffectedArc07/var/const-to-define 
Replaces all var/const with #define
 2020-03-14 15:33:44 -04:00
Fox McCloud
9a9101434b Merge pull request #13048 from Ty-Omaha/ERT 
ERT activation announcement
 2020-03-14 15:26:07 -04:00
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
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00: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