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

3538 Commits

Author SHA1 Message Date
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
SteelSlayer
4a12c0bb5c Fixes some oversights with storage altclicking 
Update secure.dm
 2020-03-15 11:40:36 -05: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
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
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
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
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
1f4cc7c75f clean up 2020-03-07 17:41:17 -05:00
Fox McCloud
4d9c89bdc0 menthol 2020-03-06 23:48:32 -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
Bryan
ff585ccd04 Code and Sprite changes 2020-03-02 21:29:45 -07:00
Ty-Omaha
77dd66942e Barber scissors refactor (#13038) 
* Scissor refactor

* removed junk from comment
 2020-03-01 13:08:28 -07:00
Fox McCloud
8f297aa4d0 Merge pull request #12683 from MarsM0nd/order_conscription_kit 
Brings orderable conscription kit in line.
 2020-02-24 19:48:46 -05:00
Fox McCloud
306fdd6629 Merge pull request #12934 from farie82/Item-armor-fix 
Make every obj/.../New() call it's parents, Fixes things not burning on lava and causing runtimes
 2020-02-24 19:42:19 -05:00
Fox McCloud
c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
farie82
c0010a0249 Makes the mindslave message bigger (#12960) 2020-02-15 17:36:51 -07:00
Citinited
fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700) 
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
 2020-02-15 13:31:08 -07:00
joep van der velden
5ca4ea4025 Removed unneeded New procs 2020-02-07 20:38:09 +01:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
SteelSlayer
b015fbd163 Adds an alt-click shortcut for opening storage items 2019-12-29 21:30:08 -06:00
Darkmight9
c5ee1c68dd Increases bag space of ERTs and death squads 2019-12-27 18:59:07 -05:00
Crazy Lemon
cc72b2fa5e Merge pull request #12811 from Kyep/link_update_2 
Domain link updates 2
 2019-12-16 19:55:08 -08:00
Kyep
fc650c273a domain links update 2 2019-12-16 18:55:51 -08:00
Darkmight9
f3ad67bd73 Changes the spray bottle in the full janitor belt to one with space cleaner in it 2019-12-12 17:27:52 -05:00
moxian
1d0b84addb Fix prisoner implant z-level checking. 
- Can no longer hide in a locker from prisoner computer tracking
- locator no longer tracks implanted people across z-levels
 2019-11-09 10:17:41 +00:00
Mars
f2f7ec956a Orderable conscription kit only without ID 2019-10-31 15:43:35 +01:00
Evankhell561
af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -04:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloud
393b248835 Removes Ancient Storage Codersprite (#12594) 2019-10-27 00:22:12 -04:00
datlo
6368447f83 Add nodrop notification 2019-10-24 20:41:36 +02:00
datlo
902b270ab1 His grace action button now links the box 2019-10-24 20:31:54 +02:00
Fox McCloud
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
AzuleUtama
3586683ef7 Vampire shapeshift and DNA scrambler clear flavourtext on use (#12546) 2019-10-15 20:07:40 -04:00
Fox McCloud
39cc83501b Fixes Explosions (#12539) 2019-10-09 09:58:27 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloud
a4641cc0cf Removes Dirty Floors (#12519) 2019-10-08 20:58:05 -04:00
Fox McCloud
f4451fcb3d Fixes Universal Damage Issues. Implements Proper Ricochets (#12532) 2019-10-08 20:41:40 -04:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
Fox McCloud
5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00