cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-28 23:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,104 Commits 12 Branches 2 Tags
d03fc7ea1ceeb67ebdde2d3d885a0e091a267fcc
Commit Graph

23525 Commits

Author SHA1 Message Date
variableundefined
c6c84c478d Merge pull request #15652 from E-MonaRhg/gamma_armory_buff_v2 
Buffs to gamma armory v2
 2021-08-14 11:30:15 -04:00
variableundefined
40141c020a Merge pull request #16493 from matttheficus/slap_cqc 
Removes Cling/Vamp CQC
 2021-08-14 11:03:40 -04:00
variableundefined
5eb9a84d11 Merge pull request #16514 from Qwertytoforty/Exchanging-positions 
Makes heat exchangers not dense
 2021-08-14 11:01:08 -04:00
variableundefined
aa820ab123 Merge pull request #16291 from SabreML/brass 
Craftable brass sheets
 2021-08-13 23:40:03 -04:00
matttheficus
7c6ad0300b Update code/modules/martial_arts/martial.dm 
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2021-08-13 18:29:13 -04:00
matttheficus
3d4163c978 Update code/modules/martial_arts/martial.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-08-12 09:51:11 -04:00
SabreML
269afcae07 Adds a pointer to the extraction location for Contractor uplinks (#16497) 
* Contractor extraction point locator V1

* `update_static_data()` revert
 2021-08-12 13:26:58 +01:00
Mitchs98
7aa225ec69 No more pull cheese (#16460) 2021-08-12 13:18:00 +01:00
SteelSlayer
f367714900 Admins who ghost have their Antag HUD defaulted to On (#16459) 
* admin default ahud

* review tweaks
 2021-08-12 13:17:44 +01:00
SabreML
ab4efc9705 Byond build version logging for clients (#16462) 
* Client minor version logging

* Player panel
 2021-08-12 13:14:06 +01:00
SabreML
69799bc32b Central Primary Hallway contract removal (#16488) 2021-08-12 13:11:50 +01:00
matttheficus
ee1a75b5b6 Variety of Admin Alert Readability Tweaks (#16496) 
* Color Swap

* more bad blue
 2021-08-12 13:09:54 +01:00
S34NW
b42da655f6 of course the ID computer does its own thing 2021-08-12 00:07:16 +01:00
variableundefined
517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefined
d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors 
Adds glass floors
 2021-08-11 16:08:09 -04:00
variableundefined
d2d2af6a14 Merge pull request #15952 from farie82/runtime-fixes-6 
Fixes 4 runtimes. Linked forum account message is now shown properly
 2021-08-11 16:06:57 -04:00
variableundefined
99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh 
Adds supermatter sliver steal and plutonium core steal objective from TG
 2021-08-11 16:05:24 -04:00
variableundefined
daa4adbb64 Merge pull request #16151 from S34NW/solgov_ERT 
SolGov SOO loadout, SolGov hardsuits.
 2021-08-11 15:55:18 -04:00
AffectedArc07
ead4ca1324 Fixes world/Topic spam limiting (#16494) 2021-08-11 15:37:37 -04:00
Qwertytoforty
f688a9c689 Makes heat exchangers not dense 2021-08-10 18:26:13 -04: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
matttheficus
6a8c86571a you forget the basics to CQC! 2021-08-06 13:30:04 -04:00
S34NW
fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01: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
S34NW
ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +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
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
bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +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
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
Qwertytoforty
c45a359769 Grammer and style 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 18:21: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
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