cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,551 Commits 26 Branches 2 Tags
18551d633a93ee4c335306cfd9b9c8ac32800a21
Commit Graph

3004 Commits

Author SHA1 Message Date
Fox McCloud
5ce3fd8929 Merge pull request #13293 from datlo/absolutezeroth 
Zeroth law is now above ion laws
 2020-04-23 10:50:29 -04:00
datlo
5e104ba569 Move zeroth law above ion laws 2020-04-13 14:04:27 +02:00
AffectedArc07
2f77f782f1 Take 3 2020-04-12 14:56:02 +01:00
AffectedArc07
c8e9cd055a More fixes 2020-04-12 14:45:53 +01: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
Crazylemon64
fc8dcff9b6 Outfits without a name will now be obvious 2020-04-10 22:39:42 -07:00
Kyep
4655e5d9d1 Fixes default-named admin outfits (#13280) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-04-10 22:56:54 -06:00
farie82
442ef4811e Improved logging (#13208) 
* Death is logged. hiveminds and robot talk is logged

* Added channels to the say log

* Shuttle logging

* Spell targets logging
 2020-04-09 23:33:53 -06:00
Crazy Lemon
f555d49b9a Removes all usages of a certain word in a certain sense (#13277) 2020-04-09 13:43:10 -04:00
Fox McCloud
a892c61607 Merge pull request #13100 from TDSSS/wiz-armor-fix 
Wizard hardsuit tweaks
 2020-04-03 18:56:11 -04:00
farie82
ebded4f39e Logging prio changes (#13174) 2020-03-22 20:47:51 -06:00
TDSSS
2562323e5c Merge branch 'master' into wiz-armor-fix 2020-03-22 03:39:18 +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
Fox McCloud
cc6c8d35a8 Merge remote-tracking branch 'upstream/master' into hypoglycemia 
# Conflicts:
#	code/datums/diseases/critical.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/life.dm
 2020-03-19 13:47:31 -04:00
TDSSS
d4a55be805 Merge branch 'master' into wiz-armor-fix 2020-03-18 00:23:54 +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
variableundefined
4c24624313 Merge pull request #13027 from Fox-McCloud/goonchem-heparin 
Goonchem: Heparin Rework
 2020-03-14 23:53:42 -04:00
Fox McCloud
e75c926a62 tweak 2020-03-10 16:53:55 -04:00
TDSSS
e364612d2a Arch wizards get actual space suits 2020-03-10 13:03:07 +01:00
Fox McCloud
97527cbd82 Hypoglycemia 2020-03-09 18:15:20 -04:00
Fox McCloud
9d9d6a8666 Goonchem: Heparin Rework 2020-02-24 18:29:08 -05:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
Ty-Omaha
8322583026 Allow numbers vv name (#12664) 
Allow admins to rename people with numbers
 2020-02-15 22:53:16 -05:00
Joseph Knutson
f59497fa09 Cult Fixes and Tweaks: Admins can cult anyone, Constructs get their comms back. (#12816) 
* allows admins to cult anyone

* Constructs get cult chat again

* made it ONLY cult constructs get cult comms
 2020-02-15 20:23:52 -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
farie82
df09966258 Instant Summons spell now respects no_drop and teleports the holder of the nodrop item to the wizard now (#12961) 
* Instant recall spell now respects no_drop

* Teleports the holder to the wizard instead now
 2020-02-14 21:54:01 -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
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Crazy Lemon
3191674f89 Merge pull request #12744 from SteelSlayer/slime-cluwne-no-die 
Getting cluwned ignores species brain damage modifiers
 2019-12-16 19:03:08 -08:00
SteelSlayer
df2de1931e use_brain_mod 2019-12-14 00:13:28 -06:00
SteelSlayer
4705a89676 Makes cluwning ignore brain damage modifiers 
Update organ_internal.dm
 2019-11-18 18:48:46 -06:00
SteelSlayer
6dbfd469a2 Adds a cancel button to the wizard teleport spell 2019-11-10 11:31:02 -06:00
Kyep
9061742db5 Dead mice squeak no tails 2019-10-27 23:16:42 -07:00
Darkmight9
19a29319de Decorations galore part 1! (#12615) 2019-10-27 00:30:05 -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
farie82
660ec0e14d Revert "Makes LINDA Aggressive" 2019-10-13 10:31:19 +02:00
Fox McCloud
63860a39b9 Makes LINDA Aggressive 2019-10-11 22:31:28 -04:00
Fox McCloud
fe403bef5c Fixes APCs Not Being Hackable (#12538) 2019-10-09 09:58:36 -04:00
Fox McCloud
e884e76445 Updates Swarmers: Fixes Swarmer Megafauna (#12516) 2019-10-08 20:57:39 -04:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
SteelSlayer
0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -04:00
farie82
82b6c821f6 Fixes toxic comp (#12490) 2019-10-03 09:20:00 -04:00
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
variableundefined
e02a76aa73 Fixes too many items in the conscription kit #12436 2019-09-29 19:41:07 -07:00