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

38759 Commits

Author SHA1 Message Date
AffectedArc07
4e40353cfa Check your conflict resolution people 2021-10-17 21:06:02 +01:00
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
066cd3be7b Merge pull request #16932 from matttheficus/TrayQOL 
Serving Tray Quality of Life - 8 Slots
 2021-10-17 13:51:00 -05:00
variableundefined
ad03268e5a Merge pull request #16870 from lewcc/breakable-ssus 
Unpowered Suit Storage Units can now be attacked
 2021-10-17 13:49:13 -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
AffectedArc07
26a3dcd48b Tweaks 2021-10-17 19:36:40 +01: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
6f337bb6f3 Merge pull request #16947 from Qwertytoforty/REROLLLLLLLLLLLL 
Makes mindslaves lose their mindslave status when their owner cryos
 2021-10-17 13:25:03 -05:00
variableundefined
1c73b4f005 Merge pull request #16931 from AffectedArc07/new-rust-g 
Upgrades RUSTG
 2021-10-17 13:24:04 -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
variableundefined
f61f449071 Merge pull request #16966 from AffectedArc07/fixes-re-admin 
Fixes re-admin not working
 2021-10-17 13:18:21 -05:00
AffectedArc07
1d750acf78 Flatty fixes 2021-10-17 18:59:54 +01:00
S34N
359c1cfb0c Adds an action button for mapvotes (#16957) 
* its a mapvote jim, but not as we know it

* new icon

* no more safetynet
 2021-10-17 18:53:40 +01: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
Qwertytoforty
e437814945 Update code/game/gamemodes/objective.dm 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2021-10-17 09:32:19 -04:00
PacifistDalek
10e568d937 I was really overthinking this, but thanks AA, this works now 2021-10-17 07:30:09 -04:00
S34N
1d8b4aca03 adds RD hardsuit SSU for mapping later (#16833) 2021-10-17 11:12:40 +01: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
5fcd831370 Simple mob glass footsteps (#16952) 2021-10-17 10:57:58 +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
c1cac4548b Yet another soulstone fix (#16960) 2021-10-17 10:55:27 +01:00
Qwertytoforty
29f6773231 Removes uneeded steps, changes from usr to owner 2021-10-15 10:56:18 -04:00
Qwertytoforty
bff6ea69de Update code/game/gamemodes/objective.dm 
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-10-15 10:54:19 -04:00
SabreML
25c4275a16 get_display_key() client check (#16950) 2021-10-15 14:10:28 +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
146351ae82 Cigarette overlay update (#16936) 2021-10-15 11:00:26 +01:00
SabreML
4fbe43e668 force_eject_occupant() override for cyborg rechargers (#16937) 2021-10-15 10:59:58 +01:00
S34N
e987448930 Fixes negative integrity mechs (#16939) 
* adds something to hopefully fix negative mech HP

* destroys destroy

* makes it do it here for more logic!

* fixes the core issue at hand also

* reverts this change to obj_defense
 2021-10-15 10:58:34 +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
Qwertytoforty
aaabb9515d Makes mindslaves loose their mindslave status when their owner cryos 2021-10-14 19:18:43 -04:00
E-MonaRhg
310616cdf3 Carpet bomb your local station 2021-10-14 20:23:11 +02:00
Mieszko Jędrzejczak
cffcadb029 stop ChangeTurf from stealing air from turfs it's not atmos adjacent to (#16864) 2021-10-14 16:58:36 +01:00
AffectedArc07
45e4458eca I really hate line endings 2021-10-14 15:58:29 +01:00
AffectedArc07
4753384c1d I think were at feature parity now 2021-10-14 15:55:42 +01:00
AffectedArc07
221ea814d8 Revert "Whole bunch of Hydroponics Sprite changes" 2021-10-14 08:00:32 +01:00