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

20066 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
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
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
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
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
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
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
S34N
1d8b4aca03 adds RD hardsuit SSU for mapping later (#16833) 2021-10-17 11:12:40 +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
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
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
matttheficus
468ff53ac7 8 because i cant count 2021-10-13 17:27:38 -04:00
matttheficus
ee16debc62 oh god does this work 2021-10-13 17:22:53 -04:00
Qwertytoforty
2f8088dc0d Update code/game/gamemodes/wizard/spellbook.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-13 14:38:57 -04:00
AffectedArc07
4ad5e41324 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-12 20:27:07 +01:00
dearmochi
28f0035172 Prevent stunbatons from stunning AIs (#16919) 2021-10-11 20:49:38 +01:00
Qwertytoforty
67508e0e3d Update code/game/gamemodes/wizard/spellbook.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-10-11 12:49:19 -04:00
Qwertytoforty
0b27d4822f Allows ghosts to mute dead chat for 2 wizard points. 2021-10-11 12:38:16 -04:00
Qwertytoforty
f5ece96b48 Update code/game/gamemodes/malfunction/Malf_Modules.dm 
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-10-10 13:36:17 -04: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
15f383e4f5 Firmware 2021-10-09 12:54:02 -04: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
S34N
f01f5adae4 makes electrochromic window spawners use a unique icon (#16834) 2021-10-09 17:09:47 +01:00
Mieszko Jędrzejczak
7c39eafafe midori-san (#16856) 2021-10-09 17:06:43 +01:00
Luc
2908f321be Fix fireaxe cabinet not dropping the axe when destroyed (#16880) 
* Move fireaxe item init later, make sure destroy properly forcemoves it too

* Normal locker code can clean up after itself

* Remove extra space, oops

* remove parent call

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-09 16:47:52 +01:00
SabreML
80a657ae9e Name Capitalisation Tweaks (Mechs) (#16897) 
* Mech part names

* Heavy Pulse Rifle

This is the only weapon without Title Case, so for consistency with the others.
 2021-10-09 16:46:05 +01:00
SabreML
007efb6d99 Airlock GC Fix (#16888) 2021-10-07 17:04:34 +01:00
Qwertytoforty
40eb870732 Polishes up and fixes bugs with the syndicate teleporter (#16844) 
* Polishes up and fixes bugs with the syndicate teleporter

* snake case

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-10-07 16:38:23 +01:00
Qwertytoforty
6def6490a0 Really dumb, yup. 2021-10-04 22:21:20 -04:00
Qwertytoforty
d9135ece44 Adds 90% of the stuff 2021-10-04 17:26:13 -04:00
S34N
952cfd7dc4 why was his done this way, wtf (#16877) 2021-10-04 20:17:00 +01:00
Farie82
b61e1ad73d Fixes unused cloners becoming bugged after emagging (#16875) 2021-10-04 20:16:02 +01:00
Farie82
2d13c33906 Makes laser pointers not go through walls (#16871) 
* Makes laser pointers not go through walls

* Add comment

* Use the laserpointer instead as center
 2021-10-04 20:15:10 +01:00
Luc
428494386b when the storage unit is SSUs 
ensures the unit can still be interacted with as usual in non-help intent even when the unit isn't operational.

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-10-04 12:41:20 -04:00
lewcc
a4bfdb0508 Merge branch 'master' into breakable-ssus 2021-10-03 23:11:00 -04:00
lewcc
288c6a8f84 SSUs are now attackable if the user doesn't have help intent 2021-10-03 23:07:36 -04:00
variableundefined
26ac6f0e93 Merge pull request #16821 from Qwertytoforty/not-to-point-fingers-but 
Adds hidden fingerprint logging to emaging arcade machines
 2021-10-03 20:51:39 -05:00
variableundefined
fb50ea1ce9 Merge pull request #16846 from Exavere/Fixes-tinted-windows-hoorah 
Fixes Electrochromatic Window Material Return
 2021-10-03 20:47:31 -05:00