cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,374 Commits 26 Branches 2 Tags
c167bbd52ddebab0bc948cfdb4a87334192b82d7
Commit Graph

9863 Commits

Author SHA1 Message Date
Fox McCloud
af26b704a2 Merge pull request #12895 from farie82/more-descriptive-offer-ghost 
Adds the job and antag status to the offer to ghost question
 2020-03-14 15:42:26 -04:00
Fox McCloud
baa80035b0 Merge pull request #12924 from farie82/queen-spit-block 
Terror queen spit is now blockable
 2020-03-14 15:34:29 -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
Fox McCloud
c6767b2c42 Merge pull request #13085 from SteelSlayer/drone-no-flash 
Maintenance drones no longer get a flash
 2020-03-14 14:21:58 -04:00
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
variableundefined
edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd 
Adds CBD
 2020-03-08 21:46:20 -04:00
variableundefined
c257d2d41d Merge pull request #12823 from Superhats/PlasmaDust 
Plasma dust now heals plasmamen
 2020-03-08 03:31:18 -04:00
Fox McCloud
dde970a6bd Merge pull request #12841 from Arvenius169/spacetempfix 
Space Temperature Implementation
 2020-03-07 19:04:04 -05:00
Fox McCloud
f496c73988 Merge pull request #12694 from TheSardele/slime-log 
Logs slime attacks correctly
 2020-03-07 18:43:35 -05:00
SteelSlayer
b45a4fc996 spelling 2020-03-06 20:37:20 -06:00
SteelSlayer
894c326725 add_default_robot_items() 2020-03-06 20:35:55 -06:00
SteelSlayer
1b74dc915f no flash 2020-03-06 13:29:47 -06:00
variableundefined
7147e51a18 Merge pull request #12645 from Citinited/pa-radiation-fix 
Makes the particle accelerator dangerous
 2020-03-05 18:27:45 -05:00
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Ty-Omaha
edaece107c VV emote logs (#13040) 2020-03-03 08:49:11 -07:00
variableundefined
461490a007 Merge pull request #13034 from Fox-McCloud/goonchem-addiction-rework 
Goonchem: Addiction Rework
 2020-03-02 00:53:41 -05:00
Ty-Omaha
428f8aff1d Sort things (#13025) 2020-03-01 13:43:00 -07:00
SteelSlayer
6a01c14fc6 Fixes a runtime when rejuvenating a borg (#13049) 2020-03-01 13:16:58 -07:00
Fox McCloud
47926f3e35 tweaks 2020-02-26 19:58:30 -05:00
Fox McCloud
138e1ad11c Merge pull request #12680 from Kyep/depot_ai_fix 
Fixes depot mobs reacting very slowly
 2020-02-24 19:49:56 -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
ce3809d32d derp 2020-02-24 02:32:07 -05:00
Fox McCloud
da67274cf4 chillax 2020-02-23 22:40:37 -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
variableundefined
46ccd11302 Merge pull request #13002 from Fox-McCloud/death-and-gasping-sounds 
Deathgasp and Gasping Sounds
 2020-02-21 22:11:08 -05:00
Fox McCloud
6a93089e9d styling 2020-02-19 23:09:22 -05:00
Fox McCloud
4397f13c72 Deathgasp and Gasping Sounds 2020-02-18 00:12:37 -05:00
Crazy Lemon
6455f64509 Merge pull request #12982 from datlo/fixipcsurgery 
Fix IPC surgery
 2020-02-15 16:53:56 -07:00
datlo
295ab9e82c Add missing translator implant check (#12874) 2020-02-15 16:44:26 -07:00
datlo
1d8c721d90 Fix IPC surgery 2020-02-16 00:03:59 +01:00
SteelSlayer
4ed5163195 Fixes an incorrect variable in an admin log statement (#12695) 2020-02-15 15:05:30 -07: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
Crazy Lemon
2e8af27d79 Merge pull request #12968 from farie82/AI-turf-click-fix 
Makes AI able to click on turfs (flooring)
 2020-02-14 21:28:22 -07:00
Crazy Lemon
0af3e9dd74 Merge pull request #12964 from farie82/bot-tracking 
Fixes bots not being trackable using the chat link as AI
 2020-02-14 21:27:05 -07:00
farie82
60d58d5b37 Fixes 4 runtimes (#12974) 
* Fixes proc: /datum/money_account/proc/charge

* Fixes necropolis_chests.dm,214 proc: /obj/item/rod_of_asclepius/attack_self

* fixes: give.dm,25 proc: /mob/living/carbon/verb/give

* Fixes: game.dm,495 proc: /proc/pollCandidates
 2020-02-14 20:22:10 -05:00
joep van der velden
c1ba51f328 Makes AI able to click on turfs 2020-02-10 23:31:41 +01:00
joep van der velden
9ad2c73d4b Fixes bots not being trackable using the chat as AI 2020-02-09 15:03:17 +01:00
Crazy Lemon
fe0533c7ac Merge pull request #12954 from farie82/resisting-fix 
Fixes straightjackets to buckle you forever
 2020-02-06 21:54:15 -07:00
Crazy Lemon
91643c1a0a Merge pull request #12658 from Kyep/mouse_squeak_fix 
Dead mice squeak no tails
 2020-02-06 21:53:10 -07:00
Crazy Lemon
a0b2d73b50 Merge pull request #12480 from PidgeyThePirate/Issue_12466_IPC_EMP_Identity_Loss_Fix 
Issue #12466: IPC EMP Identity Loss Fix
 2020-02-06 20:01:04 -07:00
joep van der velden
b143fb3797 fixed typo 2020-02-06 10:05:54 +01:00
joep van der velden
bf88ce8e55 Fixes straightjackets to buckle you forever 2020-02-03 23:27:07 +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
joep van der velden
b5dcd830e7 Queen spit is now blockable 2020-01-25 02:01:01 +01:00
joep van der velden
cc8af59490 Adds the job and antag status to the offer to ghost question 2020-01-10 13:31:10 +01:00
Kyep
2fd66d8510 replaces lentext() with length() 2020-01-06 16:01:20 -08:00
farie82
19ae2b1254 Revert "Move the handle_changeling proc call to the (new) life signal" 2019-12-24 13:50:40 +01:00
Arvenius
21523309df Update life.dm 2019-12-23 11:43:19 -05:00