cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,983 Commits 26 Branches 2 Tags
68b4faf76344b2b8a91bfb1be4be4eae12cf7fba
Commit Graph

37976 Commits

Author SHA1 Message Date
Matt
68b4faf763 Merge branch 'master' into ghost-rad-hud 2021-08-10 11:14:35 -07:00
S34N
f8a297b615 Fixes contractor extraction areas never being chosen due to bad names (#16484) 
* box centric names begone

* Update objective_contract.dm

* Update code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
 2021-08-10 10:40:27 +01:00
Qwertytoforty
d32e9f9bea Makes important terror spiders bold on hivemind. (#16434) 
* Makes important terror spiders bold on hivemind.

* whoops

* isterrorspider, spacing, and carry over

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Changes it to a loudspeaker variable

* Update code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-08-10 10:39:34 +01:00
Qwertytoforty
2ba2c20a4f Allows admins to cryo cyborgs and AI's in player panel (#16418) 
* Allows admins to cryo cyborgs and AI's

* Apply suggestions from code review

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* More requested changes

* Better cryoing and runtiming

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-06 13:50:10 -04:00
Sirryan2002
9bf4d7ad84 Sets a Mob Cap for Giant Spiders (#15923) 
* Counting and Capping for Giant Spider Spawning

* Moves magic numbers into defines

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Update code/controllers/subsystem/mobs.dm

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

* makes requested changes

* I hope to god this fixes this

* implements requested changes

* removes double parent call

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-08-05 21:23:01 +01:00
hal9000PR
b2d46ba7bc fix (#16485) 2021-08-05 14:42:33 +01:00
SabreML
ab99287296 Sentience event information (#16426) 2021-08-05 11:37:57 +01:00
SabreML
02fe0876f5 Fix bundle #3 (#16411) 
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-08-05 11:04:27 +01:00
S34N
e75d8357eb i touched the intercoms (#16483) 2021-08-05 10:55:17 +01:00
LightFire53
b2aec584b5 LightFire53 Fluff Item Grammar (#16465) 
* Update item_defines.dm

Makes it look less awkward upon examining while wearing items

* Update code/modules/customitems/item_defines.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-04 21:43:16 -04:00
Qwertytoforty
9587c30d90 Makes making multiple vampires log the number (#16482) 2021-08-04 21:42:33 -04:00
SabreML
3a284ec0b3 One character PR time (#16477) 2021-08-04 02:41:26 -04:00
E-MonaRhg
4814d4b29a Fixes the floor painter icon state (#16473) 2021-08-03 00:25:08 +01:00
Qwertytoforty
5a4dd899a9 Fixes morph for slimes (#16472) 2021-08-02 12:20:09 -04:00
Farie82
398ac7b286 Can't have infinite EMP implant charges anymore (#16469) 
* Can't have infinite EMP implant charges anymore
 + Makes the EMP implant call empulse async

* pulse pulse
 2021-08-02 13:47:24 +01:00
SabreML
baf15f25a7 Fixes runtimes caused by null client preferences (#16464) 
* Client check

* Skip character randomisation
 2021-08-01 12:31:43 +01:00
Fox McCloud
3befeec4ab Merge pull request #16350 from warior4356/drone-air 
Adds an air analyzer to drones
 2021-07-31 22:16:27 -04:00
warior4356
fecd88b228 Removes blueprints 2021-07-31 16:32:23 -07:00
SteelSlayer
761be93029 borg recharge fixes (#16463) 2021-07-31 20:08:08 +01:00
hal9000PR
33eaf68d42 spooky (#16461) 2021-07-31 14:50:17 +01:00
SabreML
6b326123ac DNR ghost spawns fix (#16458) 2021-07-30 14:57:36 +01:00
warior4356
72559ddf70 Fixes telekinesis crafting appearing at mob's feet (#16337) 
* Fixes TK building in strange places.

* Minor formatting tweaks

* replaces usr.loc
 2021-07-30 11:58:09 +01:00
dearmochi
edaf64799f Re-ups terror web deletion timer to 7 seconds (#16457) 2021-07-30 11:00:41 +01:00
Qwertytoforty
6dde6ed06c Prevents pushing a person that is pulling you (#16451) 
* Prevents pushing a person that is pulling you

* Makes it true
 2021-07-29 12:54:42 -04:00
S34N
755ddf169f Refactors and tweaks krav maga disarms (#15722) 
* refactors stinky krav disarms

* refactors the refactor of disarm messages

maybe it shouldn't say it disarmed when it didn't for NODROP, and it should definitely not duplicate DROPDEL items...

* do the same for CQC

* Apply suggestions from code review

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

* Update code/modules/martial_arts/krav_maga.dm

* Update code/modules/martial_arts/cqc.dm

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2021-07-29 07:57:29 -04:00
Deniz
63573dd060 Trenchoat-->trenchcoat (#16448) 
Fixed trenchoat mispelling to trenchcoat
 2021-07-28 19:14:58 -04:00
Fox McCloud
0032043740 Merge pull request #16409 from SteelSlayer/blob-FLW 
Adds a FLW button for blob-infected players in the check antagonists page
 2021-07-28 14:11:36 -04:00
AffectedArc07
e46f67810a Cleans up the TODOs I left all over the codebase (#16443) 
* Removes command_name() proc

* Removes GLOB.teleportlocs + GLOB.ghostteleportlocs

* Clean up IPIntel

* Tweaks karma logging

* Tweaks time
 2021-07-28 13:45:18 -04:00
variableundefined
fba7585b4e Revert "Increases most radiation dose amounts" (#16445) 2021-07-28 10:11:27 +01:00
dearmochi
c95f566cd1 Custom emotes display on runechat (#16355) 
* Custom emotes display on runechat

* document symbol arg

* Update code/__DEFINES/misc.dm
 2021-07-28 10:06:43 +01:00
SabreML
e0d15d0f79 Trait Define Refactor (#16327) 
* Adminordrazine fix

* Trait Define Refactor

* Fixes 1

* target.status_traits
 2021-07-27 19:30:00 -04:00
Qwertytoforty
b8e84c73bf Prevents vents / scrubbers from making air from walls (#16236) 
* Prevents getting free air from walls

* Almost forgot
 2021-07-27 19:26:11 -04:00
SabreML
86651f4c9f Cryo respawnability timer fix (#16442) 2021-07-27 23:01:42 +01:00
variableundefined
72dff99c99 Convert wizard contract to TGUI (#15083) 
* Convert Wizard Apprentice contract to TGUI

* Addresses concerns

* Formatting fix and redundant comment removal

* Update code and remove unused variable

* Rebuild TGUI
 2021-07-27 20:36:24 +01:00
Fox McCloud
cfde082a10 Merge pull request #15807 from hal9000PR/TG-carp-2-electric-boogaloo 
Ports TG sleeping carp, the second.
 2021-07-27 13:21:41 -04:00
Fox McCloud
9df0c803cc Merge pull request #16420 from SabreML/fire-nerf 
Fire-safety closet extinguisher tweak
 2021-07-27 13:11:17 -04:00
SabreML
326ff9d829 HUD check (#16441) 2021-07-27 17:59:35 +01:00
AllStickyGithub
24d3391a3c Added a thermostat on/off button. Tweaked target temp button. (#16016) 
* Added a thermostat on/off button. Fixed target temp button.

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: variableundefined <40092670+variableundefined@users.noreply.github.com>
 2021-07-27 12:50:18 -04:00
variableundefined
9131bb0623 Merge pull request #16439 from ParadiseSS13/revert-16435-rad_patch 
Revert "Fixes rad contamination being 10x stronger than intended"
 2021-07-27 10:10:14 -04:00
variableundefined
3055246ed5 Merge pull request #16407 from PacifistDalek/Vendor-armor 
Certain vending machines are no longer immortal
 2021-07-27 08:35:53 -04:00
variableundefined
5661f74e34 Merge pull request #16433 from AffectedArc07/sql-schema-update 
Removes table prefixes
 2021-07-27 08:33:56 -04:00
AffectedArc07
fad93ed2e4 Revert "uh oh that guy is glowing green (#16435)" 
This reverts commit 076e807731.
 2021-07-27 12:54:33 +01:00
S34N
076e807731 uh oh that guy is glowing green (#16435) 2021-07-27 10:46:26 +01:00
variableundefined
4915b39230 Merge pull request #16303 from FlattestGuitar/blur-me-up-scotty 
Stab your eyes out with style
 2021-07-26 21:50:35 -04:00
variableundefined
ce22fb12c2 Merge pull request #16312 from theo-3/cryoeject 
Make cryo start with auto eject enabled
 2021-07-26 20:40:48 -04:00
variableundefined
e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix 
Jani ERT Equipment Tweak
 2021-07-26 20:37:03 -04:00
variableundefined
0b7e40d78c Merge pull request #16395 from Qwertytoforty/old-reliable 
Better equips med ERT for the basics
 2021-07-26 20:36:09 -04:00
variableundefined
20b59aff45 Merge pull request #16389 from Qwertytoforty/reviving-revivers 
Lets revivers potentially heal you out of shock
 2021-07-26 20:35:35 -04:00
variableundefined
838dde54ec Merge pull request #15201 from SabreML/pull-facing 
Face towards structures while pulling them
 2021-07-26 20:26:44 -04:00
variableundefined
1cc930ae20 Merge pull request #15404 from SteelSlayer/atmos-alt-control-click 
Gives better feedback when control or alt-clicking pressure pumps, volume pumps, etc.
 2021-07-26 20:14:49 -04:00