cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,428 Commits 26 Branches 2 Tags
cd23b41b20ce569ff42d4fbff00a789bdb3b9729
Commit Graph

17872 Commits

Author SHA1 Message Date
variableundefined
5e2b731964 Adds an extra handheld defib to medical lockers. (#13121) 
* Zap Zap

* Fixes CLRF
 2020-03-17 19:02:46 -04:00
Mitchs98
bbfcd0de04 Alphabetizes Access on Electronics. (#13120) 
* ALPHABETIZE!!!

Yes.

* Kills spaces, hopefully.

* Fixes CLRF
 2020-03-17 19:02:36 -04:00
Mitchell
8e75487346 Fixes CLRF 2020-03-17 17:43:11 -05:00
Mitchell
230e3d8abc Merge branch 'master' into adddefibs 2020-03-17 17:26:29 -05:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
Ty-Omaha
bb340f076d Kentucky Fried Vox (#13114) 
* is finger lickin goods yaya

* is code improvements yaya

* is updates yaya
 2020-03-17 15:12:52 -04:00
SteelSlayer
4a12c0bb5c Fixes some oversights with storage altclicking 
Update secure.dm
 2020-03-15 11:40:36 -05:00
variableundefined
4c24624313 Merge pull request #13027 from Fox-McCloud/goonchem-heparin 
Goonchem: Heparin Rework
 2020-03-14 23:53:42 -04:00
Fox McCloud
48d0dfdacc Merge pull request #12863 from SteelSlayer/altclick-storage 
Adds an alt-click shortcut for opening storage items
 2020-03-14 23:26:05 -04:00
SteelSlayer
276bf1adc2 this makes more sense 2020-03-14 15:26:26 -05:00
Mitchell
a65bb8e1e6 Zap Zap 2020-03-14 15:21:50 -05:00
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
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
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
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
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
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
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
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
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
4659e3ec19 Merge pull request #12815 from datlo/honkhonkhonk 
Clowns learns clownish on spawn
 2020-03-08 03:29:51 -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
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
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
Fox McCloud
4d9c89bdc0 menthol 2020-03-06 23:48:32 -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
Fox McCloud
395bd10079 librarian tweak 2020-03-04 13:55:14 -05:00
Aquilar
c9bc00f654 grammar errors 2020-03-04 14:52:40 +08:00
Aquilar
b43f41ee47 making sure Rapaskoti's new icons work, and coding what they wanted to do. 
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
 2020-03-04 14:27:41 +08:00
Fox McCloud
c059b6ba95 Cigarette Tweaks 2020-03-04 00:32:39 -05:00
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00