cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,092 Commits 26 Branches 2 Tags
4e40353cfa9375bcf2ebd1182e4591663d36fedc
Commit Graph

23992 Commits

Author SHA1 Message Date
AffectedArc07
e843d297bf Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 20:49:07 +01:00
variableundefined
9470fd0387 Merge pull request #16889 from AffectedArc07/cui-cdl 
Moves CUI entries to CDL
 2021-10-17 13:57:14 -05:00
variableundefined
8d4b75690e Merge pull request #16873 from PacifistDalek/ghost-deck-of-cards 
Ghosts can no longer shuffle cards
 2021-10-17 13:47:26 -05:00
variableundefined
33f408ed02 Merge pull request #16849 from ProfessorDonut/danger-noodle-pai 
Snake icon and hissing speech verb for pAI
 2021-10-17 13:45:12 -05:00
variableundefined
56003f88ac Merge pull request #16884 from Qwertytoforty/A-simple-mob-problem 
Adds a malf AI upgrade for engineering borgs, adds zipties to all emaged borgs.
 2021-10-17 13:44:09 -05:00
variableundefined
909521c48d Merge pull request #16886 from Cocacolagua/unbreakable_stride 
Replaces clown magboots on the uplink with a new pair of slippers
 2021-10-17 13:40:07 -05:00
variableundefined
1531779ebe Merge pull request #16898 from Qwertytoforty/armor-PEN-etration 
Adds 20% armour penetration to the edagger
 2021-10-17 13:36:29 -05:00
variableundefined
3cc0a652d2 Merge pull request #16916 from Qwertytoforty/deader-chat 
Allows wizards to mute dead chat for 2 wizard points.
 2021-10-17 13:32:04 -05:00
variableundefined
edd1781e38 Merge pull request #16943 from E-MonaRhg/more-carpets 
Carpet bomb your station: 8 more carpet types and a carpet cargo crate
 2021-10-17 13:30:03 -05:00
variableundefined
e65ce685ca Merge pull request #16902 from AffectedArc07/magistrate-hour-lock 
Moves magistrate to a 100 security hour lock instead of karma
 2021-10-17 13:22:23 -05:00
AffectedArc07
767d8e0841 Fix 2021-10-17 16:37:40 +01:00
AffectedArc07
b105b44bed Lets give this a go 2021-10-17 16:30:19 +01:00
AffectedArc07
d966e5f36c Switch server verb 2021-10-17 16:04:16 +01:00
AffectedArc07
712dcb8904 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 15:14:03 +01:00
Qwertytoforty
fee76f5b0e localy cached 2021-10-17 10:03:40 -04:00
AffectedArc07
16fe7f6b9a Fixes re-admin not working 2021-10-17 14:56:42 +01:00
PacifistDalek
10e568d937 I was really overthinking this, but thanks AA, this works now 2021-10-17 07:30:09 -04:00
S34N
d006c249c3 Sprite tweak for long range and syndie fax machines (#16843) 
* cuts down on sprite bloat, recolours faxes

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* more prominent syndie stripe

* long range tweak

* denth tweaks

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-10-17 11:12:14 +01:00
hal9000PR
4400bca165 Prevents speed stacking with the DNA vault (#16911) 
* speed stacking fix

* makes the speed consistant
 2021-10-17 11:10:59 +01:00
SabreML
94a593cbb8 Stacking Machine GC (#16958) 2021-10-17 10:56:56 +01:00
SabreML
8c88446c68 Attack log null prefs fix (#16959) 2021-10-17 10:56:20 +01:00
SabreML
1db94b18f1 White runechat toggle fix (#16949) 2021-10-15 14:10:04 +01:00
SabreML
a66c3ac793 Grey eye check (#16948) 2021-10-15 14:08:00 +01:00
SabreML
9c23f0c8f5 is_special_character() mind check (#16938) 2021-10-15 10:57:46 +01:00
hal9000PR
0e33ca9be7 Prevents mentors speaking in deadchat when deadchat is muted (#16944) 
* nerfs mentors

* affected's suggestion

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-15 10:49:46 +01:00
E-MonaRhg
310616cdf3 Carpet bomb your local station 2021-10-14 20:23:11 +02:00
AffectedArc07
221ea814d8 Revert "Whole bunch of Hydroponics Sprite changes" 2021-10-14 08:00:32 +01:00
variableundefined
ddddc5801d Merge pull request #16930 from PacifistDalek/TG-hydroponics-sprites 
Whole bunch of Hydroponics Sprite changes
 2021-10-13 19:25:54 -05:00
variableundefined
301214a0d8 Merge pull request #16922 from SabreML/ion-ghost-message 
Makes 'Ion storm' laws show in deadchat
 2021-10-13 19:24:40 -05:00
PacifistDalek
f9849cd1f3 where the bananas are blue and their peels are slippy 2021-10-13 15:08:37 -04:00
PacifistDalek
9fb48626e8 take me down to hydroponic city 2021-10-13 13:58:14 -04:00
Vi3trice
7968046b72 Fix - Toy Griefsky doesn't spam admins with its attacks (#16924) 
* The toy version doesn't spam admins

* That is simpler
 2021-10-13 18:54:26 +01:00
AffectedArc07
7dc3d906d1 Actually tack the values on 2021-10-13 18:26:41 +01:00
PacifistDalek
eb9fede50b Still need to change filling colour of flowers 2021-10-12 15:48:34 -04:00
AffectedArc07
4ad5e41324 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-12 20:27:07 +01:00
SabreML
cfc09eef49 Ion law observer message 2021-10-12 12:17:56 +01:00
Luc
e9f6b56e94 Adds a cooldown to attacking MMIs (#16921) 2021-10-12 09:36:32 +01:00
SabreML
06a2fd5a34 Antag type mind check (#16920) 2021-10-11 20:57:03 +01:00
Qwertytoforty
0b27d4822f Allows ghosts to mute dead chat for 2 wizard points. 2021-10-11 12:38:16 -04:00
SabreML
3935be5808 Adds a discord ping for mhelps if there aren't any mentors online (#15533) 
* V1

* send2discord_simple_nomentors() proc

* Oh and this too

* Proc name

* Warning comment

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Mentor logout notification message

Adding it in this PR since it's related

* Actually on second thought, this should definitely be its own PR instead

This reverts commit 1e93624c8b.

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-11 10:05:18 +01:00
AffectedArc07
08bd05eb14 Fixes a chat HTML injection vulnerability 2021-10-10 15:54:27 +01:00
Farie82
849f9d8a17 Fix mules dropping IDs when unloading after the AI called them (#16878) 
* Fixes bot access bug.
Gives bots new access on their ID instead of a new ID.
Fixing mules dropping IDs after the AI called them

* Update code/modules/mob/living/simple_animal/bot/bot.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-09 22:10:25 +01:00
SabreML
bc739c353d Loadout DB Storage Refactor (#16453) 
* `display_name` -> Typepaths V1

* Loadout display name capitalisation

#15857

* Review 1, plus json fixes

* (Hopefully) final tweaks

* Styling nitpicks

* Extra tweaks because why not

It never caused a runtime, but the `?.` is just in case.

* Deconflicting

* Warning comment

* Whoops

Typing faster than my brain
 2021-10-09 19:35:15 +01:00
Qwertytoforty
d30f3f0984 Final steel changes 2021-10-09 14:04:02 -04:00
AffectedArc07
b4bfb521d5 Moves magistrate to a 100 hour lock 2021-10-09 18:36:31 +01:00
Qwertytoforty
bebd890081 Apply suggestions from code review 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-10-09 12:52:46 -04:00
PacifistDalek
f2b2aac1bf Update comp_board_designs.dm (#16901) 2021-10-09 17:18:00 +01:00
SabreML
816ec7dd7f 'Invisimin' logging (#16885) 
* 'Invisimin' logging

* Forgot this works

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-09 16:47:00 +01:00
Qwertytoforty
fa493b64bc Adds 20% armour penetration to the edagger 2021-10-08 20:48:24 -04:00
SabreML
cd16409c14 Teleport menu typo fix (#16896) 2021-10-08 15:19:44 +01:00