cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,316 Commits 26 Branches 2 Tags
2d99aeb72e6fa77c4ff412ea495fb19d2e19d26c
Commit Graph

23112 Commits

Author SHA1 Message Date
Kyep
2d99aeb72e update suggested client version to 513.1542 (#15744) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-04-05 17:48:41 +01:00
Qwertytoforty
e2793017bc preventions and fixes (#15726) 2021-04-05 17:46:43 +01:00
warriorstar-orion
ea38c69633 Support 28 additional hats for corgis. (#15669) 
- /obj/item/clothing/head/HoS
- /obj/item/clothing/head/HoS/beret
- /obj/item/clothing/head/beret/sec
- /obj/item/clothing/head/bowlerhat
- /obj/item/clothing/head/caphat/parade
- /obj/item/clothing/head/hardhat/dblue
- /obj/item/clothing/head/hardhat/orange
- /obj/item/clothing/head/hardhat/red
- /obj/item/clothing/head/helmet/roman
- /obj/item/clothing/head/justice_wig
- /obj/item/clothing/head/soft/black
- /obj/item/clothing/head/soft/blue
- /obj/item/clothing/head/soft/green
- /obj/item/clothing/head/soft/grey
- /obj/item/clothing/head/soft/mime
- /obj/item/clothing/head/soft/purple
- /obj/item/clothing/head/soft/rainbow
- /obj/item/clothing/head/soft/red
- /obj/item/clothing/head/soft/sec
- /obj/item/clothing/head/soft/yellow
- /obj/item/clothing/head/surgery/black
- /obj/item/clothing/head/surgery/blue
- /obj/item/clothing/head/surgery/green
- /obj/item/clothing/head/surgery/purple
- /obj/item/clothing/head/wizard/black
- /obj/item/clothing/head/wizard/magus
- /obj/item/clothing/head/wizard/marisa
- /obj/item/reagent_containers/glass/bucket
 2021-04-05 17:44:51 +01:00
Ume
ee8464cafe Fixes dream text (#15784) 
The previous [DREAMER] text during dreams and nightmares is replaced with the character's name.

Co-authored-by: Ume <Ume-D@users.noreply.github.com>
 2021-04-05 15:58:14 +01:00
Ryal
93a0f58f21 Honkbot tweaks (#15808) 2021-04-05 15:56:57 +01:00
Sean Williams
08df09afb8 Cuffs now block arm implant use (#15825) 
* no more implant interaction with cuffs

* delete pascal case
 2021-04-05 15:49:35 +01:00
Adrer
4602b84d33 Diona/unbreakable limbs now properly augment children (#15826) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-04-05 15:47:20 +01:00
hal9000PR
d0afb01509 This is probably important (#15800) 2021-04-01 19:25:04 +01:00
hal9000PR
0f4e4530a9 Gives plasmaman and skeleton an emote to rattle their bones. (#15752) 
* squish

* doot doot
 2021-03-31 19:46:50 +01:00
Adrer
53399ff87f Make RND machines check for upgraded parts when checking if an item is constructable (#15753) 
* Protolathe design buildability check efficiency

* Efficiency_coeff rounding error fix

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-03-31 19:46:15 +01:00
LordShekelstein
dc08268e67 Fixes Gloves of the North Star exploit. (#15762) 
* Fixes Gloves of the North Star exploit.

* Update miscellaneous.dm

* Update miscellaneous.dm

* Create miscellaneous.dm

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* Update code/modules/clothing/gloves/miscellaneous.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-31 19:37:58 +01:00
Kyep
46144e3c07 Syndie Space Base (#15104) 
* v1

* v2, floors

* more tweaks

* areas, powernet

* cleanup

* changed filename, added east wing, 6 slots

* syndi autolathe

* update ruins refs & config, delete comms agent

* IDs look properly syndie, names are randomized

* glass

* convert map file to TG map format

* del old file

* air alarms

* del navconsole, fix area tile

* AA request

* refactor

* AA requests II

* dorms symmetry

* deletes explosive plastitanium walls & self destruct device (from lavabase)

* add light to medical operating table

* atmos refill connectors

* add air canister and move meter in distro, add 2 portable air pumps

* improved vents

* tweaks pipes

* removes duplicate air alarm

* (PR req) replace areas/lathe/spawners with PR versions

* wrench, tele area icon, headset name

* player panel fix, replace /anyone ID with /researcher ID, ID.untrackable refactor

* fixes teleporter runtime

* "Syndicate Researcher" consistency

* cryo room

* delete syndiwrath

* default job on ID card for telecomms purposes

* add vents and airlocks

* air alarms toggle firelocks

* artvend

* trashbags

* revert alarm.dm

* delete rogue light

* update syndi lathe name, remove newscaster frame

* changes made necessary by atmos/redcross PRs

* fixes merge conflict

* update to fix conflicts with PR 15384 as well

* syndi teleporter now requires SYNDI_LEADER access, no more runtimes

* avoids making offstation cryopods always face right

* add scrubber net

* dmm2tgm

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-03-30 18:54:19 +01:00
Sean Williams
c0d07bb627 shotguns now go off in your face upon sawing (#15772) 2021-03-30 16:15:47 +01:00
E-MonaRhg
6d06dc97a4 Clothing grammar tweaks and the such (#15761) 
* Clothing grammar and the such

* Made the PR more \improper and other stuff

* Suggested stuff

* Removed 's where it made sense

There are more most likely
 2021-03-30 12:27:55 +01:00
dearmochi
275d10ca7c Removes var/ from power_restore() def (#15770) 2021-03-30 12:21:20 +01:00
Fox McCloud
4e13913d39 TG Sprite Project: R&D, Mechfabs, Telecomms, and Station Objects (#15681) 
* TG Sprite Project: R&D, Mechfabs, Telecomms, and Station Objects

* tweaks

* other sprite
 2021-03-30 12:11:39 +01:00
Kiyahitayika
397aa72669 Fix - Admin Secrets - "Make All Areas Powered", "Make All Areas Unpowered" (#15199) 
* Topic

* APC_Short, APC

* Missing Span Class in Quickpower

* Spacing, !Length, \the for Grammar

As per SabreML's suggestions and grammar additions.
 2021-03-30 12:07:15 +01:00
Qwertytoforty
2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343) 
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

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

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

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-03-30 11:55:31 +01:00
SabreML
504aba7ce0 Fixes species without hair losing their hairstyle to radiation (#15501) 
* Hairloss V1

* Unathi revert
 2021-03-30 11:51:16 +01:00
Qwertytoforty
c6b907e3e2 Adds a cooldown to some mob spawners (#15639) 
* Adds a cooldown to some mob spawners

* Mochis suggestions

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

* Converts to deciseconds

* = to

* Apply suggestions from code review

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

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-03-30 11:50:07 +01:00
hal9000PR
8ab846f3e9 Adds combat gloves plus, gives them to nukies. (#15640) 
* glove

* warning about not working with CQC

* review

* >:C
 2021-03-28 12:50:41 +01:00
Ryal
e7310cac9b Adds missing things to drone cleaning (#15553) 
* Adds missing things to drone cleaning.

* Update code/game/machinery/doors/airlock_electronics.dm

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

* Update code/game/machinery/doors/windowdoor.dm

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

* Update code/game/machinery/doors/airlock.dm

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

* Update code/game/machinery/doors/airlock.dm

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

* Moves destroyed electronics to emag_act

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-03-28 12:45:29 +01:00
Kepplerx
0b74b9e31f Update mechfabricator_designs.dm (#15515) 2021-03-28 12:39:36 +01:00
datlo
6ac66e8c3b Refactors human explosion damage, rebalance explosions and bomb armor (#15492) 
* Refactors human ex_act

* remove explode gib threshold

* Revert "remove explode gib threshold"

This reverts commit be3e07889a.

* revert to probability of gibbing

* Reduce damage of max/heavy

* update limb removal

* move damage after limb loss

* Revert damage nerf

* Update code/modules/mob/living/carbon/human/human.dm

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

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-03-28 12:37:56 +01:00
SabreML
1e7a14dd9e Emitter stacking fix (#15379) 
* General stuff

Also emitter panel icons

* The actual reason for this PR

Co-Authored-By: Ryal <6993506+warior4356@users.noreply.github.com>

* Actually do need this

* Review 1

* Turf not loc

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

Co-authored-by: Ryal <6993506+warior4356@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-03-28 12:31:33 +01:00
moxian
791ef19e64 Robotization no longer creates two MMIs. (#14991) 
And, more importantly, we no longer get a brainmob with null name.
 2021-03-28 12:21:12 +01:00
SabreML
87c5fb0e71 Reagent Vision (#15269) 2021-03-28 12:18:49 +01:00
Adrer
604e26d399 Moved mode check in welder act up (#15746) 
Co-authored-by: Erwin Boot <E.boot@student.han.nl>
 2021-03-22 11:34:48 +00:00
hal9000PR
745fa4c63d Fixes a couple bugs with Krav maga. (#15717) 
* I am definitelly stupid

* new line
 2021-03-20 18:38:02 +00:00
Marko Pomorišac
5287d56092 Disabled AI being able to open doors when its wireless is disabled (#15702) 
* Fixing being able to remotely open doors when AI is in a intellicard and has his wireless disabled.

* Fixing being able to remotely open doors when AI is in a intellicard and has his wireless disabled.

* Update ai.dm
 2021-03-20 18:35:10 +00:00
Sean Williams
cca4be869f Adds in-hand sprites to xray and mindflayer guns (#15699) 
* Xray gun and mindflayer now have proper in-hands

* Apply suggestions from jade code review

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

* banish twig guns for good

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-03-20 18:34:47 +00:00
MrMagolor
47b517e6ab Consciousness transfer potions are now usable on golem shells (#15683) 
* First test

* Initial coding/testing

* Makes it so that servant golems that have their mind transferred no longer are servants

* tiny fix?

* tiny fix

* Makes flavourtext null for all cases, not just servant

* Fixes according to reviews

* (Most of) mochi's suggestions

* Slight typo fix, reverts brain deletion

* SteelSlayer's reviewsd fixed
 2021-03-20 18:33:14 +00:00
hal9000PR
f6630ed529 inconsistancies go brrrr (#15680) 2021-03-20 18:31:00 +00:00
Marko Pomorišac
b6417a1689 Fix for unremovable photos and default photo names if no photo name is provided (#15671) 
* Update photography.dm

If no photo name is provided a default name will be assigned with an int incrementor which makes navigation through the photos a bit easier.

* Update code/modules/paperwork/photography.dm

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

* Update code/modules/paperwork/photography.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-03-20 18:29:05 +00:00
mochi
fead9ca20c Fixes terror webs stunning under airlocks 2021-03-15 20:03:55 +01:00
SabreML
76e237edc5 Fixes HUD sunglasses deconstruction (#15444) 
* sunglasses

* Unit test test

* Unit test test tested
 2021-03-14 13:17:20 +00:00
hal9000PR
181d282848 Adds a cancel combo button for krav maga (#15543) 
* pew pew

* uhhh yes

* tumblr moment

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-03-14 13:03:30 +00:00
Fox McCloud
9c425cbed3 Ports Slapping and Kissing (#15539) 
* Ports Slapping and Kissing

* forgot this

* table slapping
 2021-03-14 10:44:43 +00:00
Kepplerx
630949ffac Shaking the dead now gives a message indicating the person is dead (#15512) 
* Shaking the dead now gives a message indicating the person is dead

* Update carbon.dm

* Update carbon.dm

* Revert "Revert "Revert "Update carbon.dm"""

This reverts commit 5e5da7bb6ddba56872a05b0e5c6aaa2c835c1e94.

* Fixing, and adding a check for self waking

Overhaul based on Faries points
 2021-03-14 10:38:34 +00:00
hal9000PR
6232f9e196 Nerfs drake form. (#15235) 2021-03-14 10:27:20 +00:00
SabreML
7343ec3747 Combines some admin verbs together (#15159) 
* Admin Jumping

* GLOB.clients

* Review suggestions

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

* Blackbox comments

* Not sure why it wasn't a proc in the first place to be honest...

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-03-14 10:26:07 +00:00
Qwertytoforty
9ee679cded Adds more magic items and spells to the wizard spellbook (#15036) 
* touches more or less everthing that is magic

* Other changes I forgot to put in

* removes extra s

* nevermind lets not do drake form

* Apply suggestions from code review

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

* Better variable name

* Heart curse removed

* Re adds new stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-14 10:15:05 +00:00
Fox McCloud
114f31703c Merge pull request #15693 from mafemergency/fix_tile_atmos_overlay 
fixes tile atmos overlays going invisible
 2021-03-13 18:06:14 -05:00
Farie82
78f01c8275 Fixes an exploit with boxing gloves and other martial arts (#15711) 2021-03-13 14:18:06 +00:00
Farie82
1d3e68544f Makes the input system use an assoc list instead of a rolling buffer (#13466) 2021-03-11 19:01:44 +00:00
Fox McCloud
a7b16d08e6 Merge pull request #15638 from AffectedArc07/force-white-runechat 
Allows forcing of runechat colour for readability
 2021-03-11 13:58:41 -05:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
dearmochi
8868ff8b62 Fixes dead AIs making cryo announcements (#15701) 2021-03-11 18:07:53 +00:00
mafemergency
0bb4ba5c39 fixes tile atmos overlays going invisible 2021-03-09 08:43:14 -05:00
Fox McCloud
0dc46b7150 Merge pull request #15209 from SteelSlayer/spawn-removal 
Removes a bunch of spawn()'s
 2021-03-07 21:10:39 -05:00