cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 13 Branches 2 Tags
dev-docs-readme
Commit Graph
954 Commits
Author SHA1 Message Date
AffectedArc07andGitHub 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
KyepGitHubKyep
 		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
Citinited 40521a643b detective revolver can now screwdriver_act 2020-02-21 23:57:33 +00:00
CitinitedandGitHub 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
Evankhell561andvariableundefined af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -04:00
Fox McCloudandvariableundefined d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Fox McCloudandvariableundefined 45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
Fox McCloudandvariableundefined 5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
variableundefinedandGitHub 3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
Fox McCloudandGitHub 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 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
farie82andvariableundefined 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 6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -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
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 5d50935f31 Lavaland Update Part 3: Mob Spawning, Rivers, and Turfs 2019-09-09 01:34:02 -04:00
Couls 977433af5f Merge remote-tracking branch 'upstream/master' into dual-wielding 2019-08-27 20:11:08 -04:00
variableundefinedandGitHub 289b890e76 Merge pull request #12087 from KasparoVy/skrekked_myself_up 
Fixes Bug with Species-fitted Inhand Icons
 2019-08-26 06:40:35 -04:00
KasparoVy 285df0d994 Fixes Inhand Sprite Sheeting Bug 
Caused by #11978, the bug presented where a species that was in the sprite_sheets of an item but didn't have a custom inhand item for it picked up an item like a uniform and suddenly a grey jumpsuit was rendered on them. Happened for Vox when picking up regular uniforms because they have species-specific uniform sprites but not species-specific inhands, so it triggered the conditional and caused silly issues.
 2019-08-25 22:29:16 -04:00
Fox McCloudandGitHub b441ae1c8f Merge pull request #12080 from SteelSlayer/L6-fix 
Fixes a bug that prevented you from inserting L6 SAW magazines into the gun
 2019-08-25 18:40:19 -04:00
SteelSlayer 2dbc09f734 who said you could move? get back there 2019-08-25 08:48:20 -04:00
SteelSlayer 205b36feca Fixes not being able to insert mags into the L6 SAW 2019-08-25 01:20:31 -04:00
KasparoVy ca495b2b9b Adds Sprites for Some Armalis+Vox Gear & Species-fitting Inhand Icons, etc. 
Adds sprites for all Vox & Armalis earwear
Adds sprites for Armalis default backpack, nitrogen tank (non-'emergency' back & belt) all breathmask variations

Fixes an issue where Vox Armalis wouldn't be rendered with the proper in-hand icons for their massive noise cannons.
Fixes an issue where you couldn't species-fit earwear.
Fixes an issue where Vox Armalis couldn't wear the 'Vox' breath mask.
 2019-08-23 22:14:47 -04:00
Fox McCloud 39d0b0b3f5 Merge remote-tracking branch 'upstream/master' into crusher-trophies 2019-08-22 16:28:06 -04:00
Fox McCloud 3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Fox McCloud 9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Fox McCloud ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
Couls fae76166c2 Dual wielding! 2019-07-18 00:05:35 -04:00
Mark van Alphen 88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
variableundefinedandGitHub 5c325d33fe Merge pull request #11684 from IAmBigCoat/medbeamwarnings 
Added warnings to the medbeam gun re: stream-crossing
 2019-07-12 18:17:07 +08:00
Mark van Alphen d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02:00
variableundefinedandGitHub 742bc62c8b Merge pull request #11544 from Arkatos1/recharger 
Rechargers now show their contents and charge status on examine
 2019-07-08 20:18:36 +08:00
Mark van Alphen ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
IAmBigCoat 8645a0b0ef Added warnings to the medbeam gun re: stream-crossing 2019-06-05 01:49:58 -04:00
Mark van Alphen b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
Arkatos1 fdd2ca94d4 added get_cell() proc to remaining items using cells 2019-05-18 23:52:18 +02:00
Arkatos1 e000e29b09 rechargers now show their contents and charge status on examine 2019-05-18 19:56:30 +02:00
Mark van Alphen eac4f841ce Switch to penetrator/sopo rounds only 2019-05-02 01:39:11 +02:00
Mark van Alphen 5216106192 Uplink kit rebalance 2019-05-01 21:35:56 +02:00