cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 07:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,254 Commits 26 Branches 2 Tags
73eb77412571faba29c21b51a306a2758cbee28f
Commit Graph

808 Commits

Author SHA1 Message Date
joep van der velden
a37652b70c Logging View scaling, health, formatting changes 2020-03-26 21:34:55 +01: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
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloud
ef439c29df Merge pull request #12813 from farie82/itemslot-pixelfuckery 
Clicking item slot now clicks the item in it [PORT]
 2020-03-08 03:29:41 -04:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
Crazy Lemon
6455f64509 Merge pull request #12982 from datlo/fixipcsurgery 
Fix IPC surgery
 2020-02-15 16:53:56 -07:00
Crazy Lemon
0bbf410495 Fixes a runtime with revenants when they click on mobs (#12890) 
* Fixes a runtime with revenants

* explanation comment
 2020-02-15 16:52:20 -07:00
datlo
3df52f09dd add clarity brackets 2020-02-16 00:21:30 +01:00
datlo
1d8c721d90 Fix IPC surgery 2020-02-16 00:03:59 +01: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
c1ba51f328 Makes AI able to click on turfs 2020-02-10 23:31:41 +01:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
SteelSlayer
f0b50ab60c explanation comment 2020-01-11 21:24:08 -06:00
SteelSlayer
692301efb6 Fixes a runtime with revenants 2020-01-08 09:02:52 -06:00
joep van der velden
3c00df376a inventory slot tweak 
Clicking on an inventory slot now uses the item there first then tries
to equip
 2019-12-17 17:11:40 +01:00
unknown
a847938324 merge with master 2019-12-14 00:58:40 -05:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Coul
3554c78e6b make 513 compile 2019-10-17 20:48:25 -04:00
Fox McCloud
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -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
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -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
d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
Fox McCloud
410f23edbb Can Move Dense Objects Around Corners (#12337) 2019-09-20 17:58:19 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Tom Heeren
62dc191a34 Revert "Middle Mouse button now toggles airlock safeties for AIs." 2019-09-04 18:40:48 -05:00
Fox McCloud
86dfb4c823 Simple Mob Update 2019-08-30 20:32:08 -04:00
variableundefined
9a29a171f3 Merge pull request #11948 from Emanthealmighty/Playerinteractionblob 
Blobbernaut major changes (player control!)
 2019-08-25 16:39:07 -04:00
Tayyyyyyy
d6b85396c2 Fix parallax null turf runtime 2019-08-24 11:53:06 -07:00
Fox McCloud
1a52416e6f Fixes Parallax 2019-08-23 18:59:46 -04:00
Fox McCloud
f8c447dbba Merge pull request #12023 from SteelSlayer/ghost-health-analyzer 
Health and Cyborg analyzer for ghosts
 2019-08-22 19:54:48 -04:00
Tayyyyyyy
4fa093fb2c Improve shuttle parallax stopping 2019-08-19 21:29:13 -07:00
Fox McCloud
c805cda038 Merge pull request #11615 from Tayyyyyyy/aa/parallax-no-sql 
Parallax
 2019-08-19 21:13:33 -04:00
Tayyyyyyy
c73f0aafd2 Shuttle parallax! 2019-08-19 18:01:45 -07:00
SteelSlayer
3e7156e263 Ghost health/cyborg analyzer 2019-08-17 10:00:05 -04:00
variableundefined
12824643ab Merge pull request #11863 from Emanthealmighty/AIsafetyshortcut 
Middle Mouse button now toggles airlock safeties for AIs.
 2019-08-16 20:43:06 +08:00
variableundefined
a5e94c6e72 Merge pull request #11776 from Arkatos1/SlimeHUD 
SlimeHUD
 2019-08-15 10:37:12 +08:00
Tayyyyyyy
7b8e0ca905 Update for parity with tg's parallax implementation 2019-08-14 17:53:15 -07:00
variableundefined
0a97f8f5ba Merge pull request #11810 from Arkatos1/ButtonSwap 
Action button swapping
 2019-08-14 23:43:11 +08:00
tayyyyyyy
760009a0cb Fix style 2019-08-13 16:32:31 -07:00
Floyd
dee792b396 Lavaland parallax! 2019-08-13 16:32:31 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
Arkatos1
cedec38e9b Merge https://github.com/ParadiseSS13/Paradise into SlimeHUD 2019-08-12 16:38:33 +02:00