cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 04:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,296 Commits 26 Branches 2 Tags
6d06dc97a40a9f5beeb897f4a97cab7bbfa2a045
Commit Graph

23099 Commits

Author SHA1 Message Date
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
Qwertytoforty
baca3707ea Adds the RD hardsuit from TG, removes war crimes (#15646) 
* let the pain begin

* Finishes drask sprites

* Apply suggestions from code review

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

* Grey, pixel fixes, steel fixes

* Skrell, taj, all that fun

* Skrek vulp, all my kin hate vulp

* nevermind vox are the worst, also adds unathi, and removes even more warcrimes ™️

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-07 18:05:41 +00:00
SabreML
0fdcd9ca8f Makes Mugwort Tea remove harmful chems (#15651) 
* Mugwort

Mugwort is a common name for several species of aromatic flowering plants in the genus Artemisia. In Europe, mugwort most often refers to the species Artemisia vulgaris, or common mugwort.

* I am very smart
 2021-03-07 12:24:25 +00:00
Fox McCloud
fdc6ab2211 Damns Devils Gamemode to Hell (#15672) 
* Damns Devils Gamemode to Hell

* Update config.txt
 2021-03-07 12:00:02 +00:00
Fox McCloud
e8af0fcc75 Fixes Blind Golems and Skeletons (#15676) 2021-03-05 20:30:13 +00:00
Fox McCloud
8064242b75 Fixes Skrell Headpockets (#15660) 
* Fixes Skrell Headpockets

* grammar fixes
 2021-03-05 14:51:47 +00:00
Fox McCloud
4052e2b49e Fixes Some Issues With Cybernetic Eyes (#15666) 2021-03-05 14:48:28 +00:00
AffectedArc07
fd79e342a8 Fixes rank being a reserved SQL keyword (#15661) 2021-03-04 11:50:36 -07:00
Fox McCloud
926d484277 Moves External Organs to Nullspace (#15548) 
* Moves External Organs to Nullspace

* additions

* oops

* further cleanup
 2021-03-03 21:34:49 +00:00
Fox McCloud
75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519) 
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
 2021-03-03 20:21:30 +00:00
Fox McCloud
dcace52184 Makes the Clown All Powerful (#15612) 
* Makes the Clown All Powerful

* sadtrombone.ogg
 2021-03-02 16:16:47 +00:00
Fox McCloud
7be1416ef0 Footstep Sound Overhaul (#15628) 
* Footstep Sound Overhaul

* remove these

* tweaks
 2021-03-02 10:01:57 +00:00
SabreML
983d39925f Blood colouring in syringes (#15626) 
* Blood reagent colours

* Clarification
 2021-03-02 09:30:18 +00:00
NotDhu
a4ebb3a36f Makes AI announcements support genderless option (#15614) 
* Makes AI announcements support genderless option

* Oops.
 2021-03-02 09:29:47 +00:00