cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-04 13:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,046 Commits 31 Branches 2 Tags
43dbf9d0c10b889334d7620186b9b1d4e05ab4f3
Commit Graph

842 Commits

Author SHA1 Message Date
AffectedArc07
75bbf7a6d5 Merge pull request #14088 from kugamo/Inhand-sprites-for-cigarette-packets 
Inhand sprites for cigarette packets
 2020-09-02 11:04:41 +01:00
ExusA
c1756fe7e3 Update code/game/objects/items/weapons/storage/belt.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-08-19 18:09:13 +08:00
ExusA
9f62b5534b fixes indentation and duplicate code 2020-08-18 22:21:25 +08:00
ExusA
f0dc996149 Update belt.dm 2020-08-16 23:50:30 +08:00
ExusA
9401458416 actually what i meant to submit 2020-08-16 21:53:46 +08:00
Kugamo
40f5e0ecd6 references the new sprites 2020-08-15 23:07:10 -05:00
Kugamo
d7a479e879 Adds many inhand sprites for cigpacks and animates lighers 2020-08-15 23:06:37 -05:00
ExusA
addb0c1a26 Update belt.dm 2020-08-13 15:00:49 +08:00
ExusA
f61d92ef0e Merge branch 'master' into Spray-Fix 2020-08-13 14:46:16 +08:00
ExusA
51c63c64c3 Update belt.dm 2020-08-12 20:17:21 +08:00
ExusA
266939684f Fixes hydro sprays 2020-08-12 20:09:53 +08:00
AffectedArc07
601a5db433 Merge pull request #13378 from Fox-McCloud/applicator-tweaks 
Applicator QoL Tweaks
 2020-08-08 16:53:18 +01:00
AffectedArc07
debcf5dad0 Replaces all "var " with "var/" 2020-07-29 10:06:00 +01:00
warior4356
93b43721f3 Adds empty cig packets 2020-07-14 01:05:12 -07:00
AffectedArc07
e305530d59 Obliterates Zombies 2020-07-02 21:22:55 +01:00
Fox McCloud
6d3f4a98e8 Nerfs Trashbags (#13545) 2020-06-23 17:19:03 -04:00
SteelSlayer
2cbe6f470c call parent 2020-05-28 12:57:08 -05:00
SteelSlayer
8b8423574a borg alt click fix 2020-05-27 16:12:03 -05:00
ZomgPonies
defbf5b6df Lizard skin handbag (#13477) 
* lizard handbag crafting recipe

* lizard handbag item

* lizard handbag sprites

* Fix styling of skin recipes
 2020-05-24 14:07:41 -04:00
datlo
9fcb19126e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-18 09:22:27 +02:00
Fox McCloud
d8134fd328 Refactor and Fixes EMP's (#13420) 2020-05-14 20:39:44 -04:00
Fox McCloud
dc6a5691fa Applicator QoL Tweaks 2020-05-04 19:15:35 -04:00
Fox McCloud
faecf7cbfa Patch rework (#13062) 
* Patch Rework Part 1

* applicator

* fixes

* fixes

* temperature settings

* single application patches

* additional

* new line fix

* fox  is a derp sometimes
 2020-05-02 20:07:43 -04:00
datlo
61adc6abb9 Add wizard loadouts 2020-03-22 12:32:51 +01:00
SteelSlayer
fb9a10a681 More storage alt-click storage fixes (#13145) 
* fix not being able to open secure wall safes

* add fingerprint handling and bag-opening sound

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
 2020-03-20 22:03:27 -06:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152) 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
 2020-03-20 21:56:37 -06: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
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
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
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
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
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