cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-22 00:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,688 Commits 26 Branches 2 Tags
522390c0b981ca045202ab804ee9eb8a87149d3c
Commit Graph

1364 Commits

Author SHA1 Message Date
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
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
SteelSlayer
c91707b9e5 no more borg KA spam 
logic fix

logic fix

logic fix
 2019-09-25 20:56:12 -05:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
 2019-09-21 12:40:07 -04:00
Fox McCloud
6711f92099 Merge pull request #12326 from Couls/missing-keyword-args 
fixes some missing arguments and runtimes
 2019-09-17 21:03:11 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Coul
27e65d9215 remove KA fix 2019-09-16 16:24:13 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Dave
92ab30b165 There's a new sheriff of magic town 2019-09-16 03:03:01 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
variableundefined
db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
variableundefined
ee86b56d58 Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep 
Refactors Atmos Air Current Pushing
 2019-09-11 01:28:55 -04:00
Shadow
960424903a :kappap: 2019-09-10 21:51:15 -05:00
Shadow
fda20578d1 HUNGRY HUNGRY :boxen: 2019-09-10 21:35:45 -05:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud
5d50935f31 Lavaland Update Part 3: Mob Spawning, Rivers, and Turfs 2019-09-09 01:34:02 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefined
0cdacbc5ee Merge pull request #11882 from Couls/dual-wielding 
Dual wielding!
 2019-08-27 20:44:38 -04:00
Couls
1f3762facb Use add timer instead of a spawn 2019-08-27 20:11:29 -04:00