cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-07 06:23:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,792 Commits 15 Branches 2 Tags
08c05a4814d7c19151a21df2e58abb0a02133377
Commit Graph

36136 Commits

Author SHA1 Message Date
Ryal 08c05a4814 Adds Earmuffs providing immunity to Changeling shriek (#14033) 
* Adds Earmuff immunity to shriek

* Refactors hearing protection and adds deafness

* Update human.dm

* Removed implicit src
 2020-09-20 18:32:27 -04:00
SteelSlayer 01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196) 
* proximity monitor

* Update code/__HELPERS/unsorted.dm

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

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-20 13:31:16 -04:00
Daylight ead6e898a3 Makes emotes that require air gasps when you have 35+ oxygen damage (#13347) 
* Makes emotes that require air gasps when you have 40+ oxy damage

* Update emote.dm

* Update emote.dm

* Makes code less copypasta

* You can no longer scream 20 times a second. Also explains why this code needs 3 switches

* Whitespace change
 2020-09-20 12:51:00 -04:00
farie82 81682dc626 Adds muzzle flashes for guns depending on the ammo (#13322) 
* Muzzle flashes added for guns

* Use an muzzle flash effect now.

* Unused var

* sillenced guns have a lower alpha muzzleflash effect
 2020-09-20 12:41:45 -04:00
AffectedArc07 f110cef216 [TGUI] Cargo Console (#14386) 
* TGUI Cargo Console

* Addesses Mochi
 2020-09-20 11:47:14 -04:00
AffectedArc07 fd93843adb Merge pull request #14391 from farie82/deny-shuttle-call-question 
Adds a confirmation to the deny shuttle call verb
 2020-09-20 12:12:25 +01:00
farie82 d68ea1dc42 Update code/modules/admin/verbs/randomverbs.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-20 12:35:01 +02:00
AffectedArc07 b093b189d9 Merge pull request #14388 from Edan52/tgui-tankdispenser 
[TGUI] tank dispenser
 2020-09-20 10:26:39 +01:00
Edan52 9fe8addb84 Update 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-20 10:17:42 +01:00
joep van der velden dccd56d640 Adds a confirmation to the deny shuttle call verb 2020-09-20 11:12:48 +02:00
AffectedArc07 dac5b92c83 Merge pull request #14359 from farie82/silicon-airlock-fixes 
Makes silicon clicking shortcuts behave the same as the TGUI interface. Plus fixes
 2020-09-20 09:44:29 +01:00
SabreML b73fc0c29b Adds a 'Clear Scanner Records' action for Forensic Scanners (#14274) 
* Adds clear_scanner as a verb

* Changed 'spawn()' to 'addtimer()'.

Also made the 'ding' sound a bit quieter.

* Some 'attack_self()' refactoring

* Some 'print_scanner_report()' refactoring

* Some 'scan()' refactoring

* Changes 1 & 0 to TRUE & FALSE

* and the rest of them

* Review fixes

Moved 'lowertext()', removed implied src,
changed '\the [target_name]' to '[A]'.

* Changed 'clear_scanner' from a verb to an action

* Made 'print_forensic_report' its own action

Don't want reagent scanners getting the same icon

* More cleanup
 2020-09-19 23:04:07 -04:00
Darkmight9 4d5c368432 adds a wide varriety of new loadout options and some minor cost adjustments (#12873) 
* adds a wide varriety of new loadout options and some minor cost adjustments

* forgot to enable the vox plushie

* Removed the contravercial items and added camera, kilt, and lizard plushie as choices

* Deconflicted and the unwanted items removed
 2020-09-19 20:57:50 -04:00
ExusA 686974955d Recycler & Conveyor switch examines (#14263) 
* initial commit

* updated!

Now includes instructions on examine on how to use the switches, belts and their respective assemblies.

* review committed!

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2020-09-19 20:16:30 -04:00
Kugamo fbf1935def Reworks floor/airlock/pipe painters' sprites and sounds. (#14379) 
* Adds new sprites, and sounds to painters.

* Adds check, and inhand sprites

* minor fixes on sprotes
 2020-09-19 20:15:54 -04:00
AffectedArc07 2c93d34575 Merge pull request #14387 from Dovixx/corpse-interaction 
Stops dead people from being able to interact with certain things
 2020-09-19 21:35:16 +01:00
Edan52 08231fc897 tankdispenser 2020-09-19 21:23:40 +01:00
Dovixx b35a9f3af3 Add the checks 2020-09-19 23:16:59 +03:00
mochi 828742a451 Merge branch 'master' into tgui-login-plugin, address AA 2020-09-19 22:03:36 +02:00
mochi be0db9984b Make dreamchecker happy 2020-09-19 20:30:27 +02:00
SteelSlayer 64a6666d27 Merge remote-tracking branch 'upstream/master' into tgui-portable-scrubber 2020-09-19 10:04:55 -05:00
mochi 5e40da0a13 Merge branch 'master' into tgui-login-plugin 2020-09-19 17:03:00 +02:00
mochi f30dffc6b7 Creates login plugin for TGUI to streamline and unify login frontend and backend 2020-09-19 16:48:48 +02:00
SteelSlayer c8f8b21eef tgui portable scrubber 2020-09-19 09:47:19 -05:00
AffectedArc07 ff26229f34 Merge pull request #14099 from Kyep/skills_rework 
Replaces skills computer with skills HUD glasses
 2020-09-19 15:00:21 +01:00
AffectedArc07 a896bc825f [TGUI] Camera Consoles (Actual Magic) (#13750) 
* TGUI Camera Consoles

* inb4 I fail my own CI routines

* Makes it so AIs cant use cam consoles

* Refactors camera bugs
 2020-09-19 09:55:33 -04:00
Kyep c303256d19 AA request 2020-09-19 06:49:01 -07:00
Kyep be024bbbcc Merge remote-tracking branch 'ParadiseSS13/master' into skills_rework 2020-09-19 06:39:38 -07:00
AffectedArc07 ce2f0d401d Swings the axe on modular consoles (#14355) 
* Swings the axe on modular consoles

* Experience will not save you in these parts
 2020-09-19 09:36:56 -04:00
AffectedArc07 41802dda44 Merge pull request #14367 from Kyep/tgui_firealarm 
Replaces firealarm interface
 2020-09-19 14:11:18 +01:00
AffectedArc07 c5fece9cfe Merge pull request #14383 from TDSSS/donk-fix 
The return of the donk
 2020-09-19 14:06:29 +01:00
TDSSS 6e7ca4000f fix donks 2020-09-19 14:51:10 +02:00
Kyep 9a50149fa2 Terror princess egg / wrap fixes (#14380) 
* fix princess egg timer text implying the wrong egg generation rate

* fix terror corpses being wrappable in some situations

* Princesses now get a warning to get out of the vent every 30 seconds

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-09-19 00:00:10 -04:00
Kugamo 172e4ac1ca Adds Atmos magboots, and tweaks magboot sprites. (#14192) 
* Adds sprites for atmosmagboots, and their functionality

* adds atmos magboots to the atmos hardsuit storage units

* Adds gust protection to advanced magboots

* rearranges if and else statements, and corrects missing SPAN

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

* deconflict

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2020-09-18 19:43:42 -04:00
TDSSS 33f600d0d3 Spray logging improvement (#14331) 
* better logging

* now with target
 2020-09-18 19:41:46 -04:00
dearmochi 101ad5b617 Ports security webbing from /tg/ (#14354) 
* Ports security webbing from /tg/

* Can only be purchased from cargo (15 pts for 3)
 2020-09-18 18:53:42 -04:00
farie82 bf5c3131d8 Unusable martial arts now doesn't block normal behaviour (#14377) 2020-09-18 18:52:06 -04:00
EmilyFontaine 3067ce16aa Properly genders Araneus (#14352) 
* female araneus

Properly genders Araneus in the code

* Update code/modules/mob/living/simple_animal/hostile/retaliate/pet.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-18 18:49:16 -04:00
RedWolfie e1559e46a9 Prevents reviving emagged maint drone (#14372) 
* stop reviving emagged drone

* revert debug change
 2020-09-18 18:39:24 -04:00
RedWolfie 10e6cc852e deletes invertHTML function (#14369) 2020-09-18 18:39:09 -04:00
AffectedArc07 8d762817ed Merge pull request #14373 from SabreML/Vending-size 
Fixes Vending Machine window size
 2020-09-18 19:58:03 +01:00
SabreML 5094d7bdb6 Fix vending machine window size 2020-09-18 19:37:13 +01:00
mochi b02c41ba63 Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-18 20:27:23 +02:00
mochi 16d6beaca5 Add NanoMaps to Reload UI Resources verb 2020-09-18 20:26:30 +02:00
AffectedArc07 41b87b5654 Merge remote-tracking branch 'Paradise/master' into pr/SteelSlayer/14371 2020-09-18 19:00:41 +01:00
SteelSlayer 364138eaaf Merge remote-tracking branch 'upstream/master' into tgui-portable-pump 2020-09-18 12:35:00 -05:00
SteelSlayer 9c5a8a1235 tgui pump 2020-09-18 12:22:19 -05:00
AffectedArc07 51245ad1a0 Merge remote-tracking branch 'Paradise/master' into pr/RedWolfie/14328 2020-09-18 17:56:37 +01:00
RedWolfie 61b122aaf3 corrected blind message when knocking someone off a table (#14370) 2020-09-18 12:47:53 -04:00
AffectedArc07 76361cda84 Ports TG's topic limiting (#14330) 2020-09-18 12:47:37 -04:00