cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 09:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,910 Commits 26 Branches 2 Tags
b6f26be8da8fb4aa6bbe66829fc1d1a23738eb10
Commit Graph

1236 Commits

Author SHA1 Message Date
joep van der velden
b6f26be8da refactor 2020-06-20 08:43:39 +02:00
joep van der velden
2960351ce6 Fixes bullets that are GCed from continuing. Remove legacy 2020-06-18 09:37:17 +02:00
Fox McCloud
c20487a876 Merge pull request #13344 from Daylight2/door-stuff 
Fixes #13243 - Makes wands no longer work in den
 2020-05-05 04:05:26 -04:00
SteelSlayer
faeb575c14 forcemove 2020-05-03 20:54:59 -05:00
SteelSlayer
e79ca9fcac crossbow cell fix 2020-05-02 22:18:30 -05:00
Daylight
a44c9b57e7 Probablly should remove this too. 2020-05-02 15:51:14 +03:00
Daylight
83ab08bae9 Makes no_den_usage only on door wand again 2020-05-02 15:46:59 +03:00
Daylight
ac0c227b21 Uses TRUE instead of 1 2020-04-28 15:52:43 +03:00
Daylight
8f28b1eef2 Moves den usage to parent, all wands no longer work on den 2020-04-28 15:26:27 +03:00
Daylight
027036ef46 Revert "Revert "makes wand of door creation not work in den"" 
This reverts commit 7eac9c92be.
 2020-04-28 02:13:04 +03:00
Daylight
7eac9c92be Revert "makes wand of door creation not work in den" 
This reverts commit 91cf99f20e.
 2020-04-28 00:30:18 +03:00
Daylight
91cf99f20e makes wand of door creation not work in den 2020-04-28 00:21:57 +03:00
farie82
1b5641d3fe Merge branch 'master' into runtime-fix-2 2020-04-19 00:01:37 +02:00
AffectedArc07
928a8f0e04 Makes the code pass dreamchecker (#13161) 
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
 2020-04-11 15:59:16 -06:00
AzuleUtama
a6330d5977 Added sprite and updated compact rifle icon (#12825) 2020-04-10 22:39:18 -06:00
farie82
4d4da7653d Makes the KA and energy guns use Initialize instead of New fixing the KA runtime (#13227) 
* Makes the KA and energy guns use Initialize instead of New

* Fixes
 2020-04-09 22:58:10 -06:00
farie82
ebded4f39e Logging prio changes (#13174) 2020-03-22 20:47:51 -06:00
farie82
9338b7a0ed Merge branch 'master' into runtime-fix-2 2020-03-22 08:36:40 +01:00
farie82
604daa05e1 Adds a new logging system and a logging view (#13115) 
* Super early initial commit

* Why do I keep comitting this

* in between

* In between

* Sort fix. Transfer fix. HTML and more

* Scrolling + define values change

* Search fixes and time input fixes

* Minor tweaks. Fuel tank inclusion. Fixes

* derp

* Extra logging to fuel tank

* minor stuff

* add the message to admins for fueltanks

* Don't keep mob/atom references + fixes

* line fixes?

* Review improvements

* pois comment
 2020-03-21 17:28:20 -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
joep van der velden
07ffa0f60a Merge branch 'ParadiseSS13/master' into runtime-fix-2 2020-03-18 16:59:49 +01: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
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
Kyep
bd85adb11c Fixes cyborg energy weapons costing twice as much as intended 2020-03-04 02:25:36 -08:00
Fox McCloud
9a2f941f1d Merge pull request #12986 from Citinited/bugfixes-two 
Some more bugfixes from the tool refactor
 2020-02-24 19:45:03 -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
Citinited
40521a643b detective revolver can now screwdriver_act 2020-02-21 23:57:33 +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
5f293e0f44 Fixed a few funtimes 2020-01-30 23:28:59 +01:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
FreeStylaLT
0ea89b98d1 Oopsie woopsie nully wubby (#12812) 2019-12-17 08:19:39 -05:00
Crazy Lemon
b50b3f332e Merge pull request #12808 from FreeStylaLT/reflecting_on_reflections 
Fixes reflectors and a Projectile angle bug
 2019-12-16 18:36:49 -08:00
joep van der velden
4003be153d firer can't be a non mob 2019-12-16 22:28:47 +01:00
FreeStylaLT
d911954920 Fixes reflectors and a Projectile angle bug 2019-12-15 12:04:29 +02:00
joep van der velden
f005908970 Fixes the juggernaut reflect and refactors the reflect to be a proc instead of copy pasta 2019-12-12 17:25:15 +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
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Fox McCloud
45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
f4451fcb3d Fixes Universal Damage Issues. Implements Proper Ricochets (#12532) 2019-10-08 20:41:40 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
variableundefined
2a27aaa1ff Syringe Refactor. Overhauls Lethal Injection Syringe (#12467) 
* Syringe Refactor. Overhauls Lethal Injection Syringe

* fixes
 2019-10-04 14:48:35 -04:00
Fox McCloud
73f530d843 Merge pull request #12421 from SteelSlayer/mining-borg-gps-fix 
Mining borg QoL update and fix
 2019-10-02 20:46:48 -04:00
SteelSlayer
c4933d76d5 what I get for trying to code at 2 am 2019-10-02 02:10:46 -05:00
SteelSlayer
a5e1b75aee oop, want this in the KA file not energy 2019-10-02 02:03:26 -05:00
SteelSlayer
b895864a1a robocharge overload 2019-10-02 02:00:50 -05:00
Fox McCloud
a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
SteelSlayer
719aa65fa6 less hacky code update 2019-09-27 22:49:58 -05:00