Commit Graph
213 Commits
Author SHA1 Message Date
LucandGitHub 9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184)
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
Henri215andGitHub f3fa59a5c0 Ports TG stamp sound effect (#20087) 2023-01-07 19:55:55 +00:00
warriorstar-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
warriorstar-orionandGitHub 77f576a5ca Recategorize in-game announcements by priority. (#19639) 2022-12-19 17:02:22 +00:00
Vi3triceandGitHub 03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388)
* I wasn't done

* nits
2022-10-28 19:28:23 +02:00
Vi3triceandGitHub 59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
GDNandGitHub 313495d36e Puts paper on layer 3 (#19344) 2022-10-12 20:19:07 +02:00
Vi3triceandGitHub 20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
924e8cc949 Renames non-cybernetic implants to bio-chips (#18937)
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

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

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-09-24 14:24:25 +01:00
warriorstar-orionandGitHub 9fb950d1af Fix typo. (#18760) 2022-08-10 15:01:36 +01:00
VizandGitHub cc6b9c038d Replaces "taser" with "disabler" in two places where it's now true (#18621)
* taser i hardly know her

* oopsie
2022-07-29 14:22:01 +01:00
c1376e08f8 Adds a lavaland and a space ruin, adds a "nest" structure (#18508)
* Adds goliath/grub lavaland ruin

* Adds syndicate drug lab ruin

* Fixes nest.dm issues

* Fixes APC init

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

* Satisfies linter

* Addresses AA review

* Addresses Farie and AA reviews

* Missed a \the

* Adds comments

* Made the warning message stand out more

* Removes redundant initial desc

* Moves APC vars out of init

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

* Replaces plating with airless plating

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-27 21:32:40 +01:00
Vi3triceandGitHub f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
KalevTaitandGitHub 209c12f745 paperwork (#18297) 2022-07-10 14:01:29 +01:00
Fox McCloudandGitHub 55a6c23bc7 Removes civilian: Return of the Assistant King (#17103)
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
2021-11-16 19:49:08 +01:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
SabreMLandGitHub 6eb6747980 Allows Ian to eat homework (#15786)
* Dog food V1

* m

* Fixed string

* Review thing
2021-04-17 13:45:40 +01:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloudandGitHub efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +00:00
Fox McCloudandGitHub 02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
00002a7f3a Fixes visible message when showing paper (#15270)
* Fix

* Other stuff

* Review and lipstick fix

* !do_after()

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

* Unstaleining

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-01-18 22:16:47 +00:00
moxianandGitHub 1683c4271a Refactors renaming things with a pen. (#14960)
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
2020-12-16 14:43:15 -05:00
Darkmight9andGitHub 8782c2ca32 Culinary QoL update (#14610)
* Culinary QoL update

* Changed the culinary tool apron sprites
2020-10-17 13:30:44 -04:00
826cefeca7 Adds new SecHUD designations and tweaks secHUD on examining (updated 22 May) (#12666)
* Add new criminal_status

* Add new criminal_status

* Update security.dm

Add new criminal_statuses to sec records console

* Fix beepsky not arresting executees

* Sechud now shows latest comment on examination

* Update human.dm

Add new criminal_status

* Update hud.dmi

Add new sechud icons, animated hudexecute

* Sechud now shows latest comment on examination

Simplified it according to farie's notes

* Sechud now shows latest comment on examination

Once more, thanks Henk!

* Sechud now shows latest comment on examination

Per Henk's review, another one bites the dust.

* Machinery threatcounts fixed

I just noticed that actually this doesn't affect beepsky, but turrets at portable_turret.dm. Well, now there they are.

* Turret threatcounts fixed

Now it should be proper: execute status now counts as threat to turrets.

* Update hud.dmi

New sechud statuses. Hourglass symbol for search status

* Update hud.dmi

DISREGARD: Test commit for affected on icondiffbot

* Update hud.dmi

New sechud statuses. Hourglass symbol for search status

* Revert "Update hud.dmi"

This reverts commit 8deaf40679.

* New sechud statuses. Zoomglass for search status (now).

* New sechud statuses

Make ghosts with all HUDs or sechud enabled able to use the examine function of sechud.

* Add new sec statuses

LF and conflicts resolved

* add new sec statuses

LF and conflicts resolved

* fix turret threatcounts

LF and conflicts resolved

* add new sec statuses

LF and conflicts resolved

* add new sec statuses, add sechud ghost examine

LF and conflicts resolved

* Add new sec statuses

LF and conflict resolving take2

* Add new sec stasuses

LF and conflict resolve take2, rid with empty lines

* Fixing Travis warning on list access at 355

* On built fail

trailing newlines accidentially forgotten, check, warning on list access, better but still not gone (got to git gut)

* Fixing usage of LAZYACCESS

Yeah - there was just un-necessary stuff there. Thanks to AA and Farie for help

* One last un-necessary thing off

* Move criminal status to defines.

Per Farie request: criminal statuses are now defines, every usage of them moved to utilize them. Minor: CC evilfax uses now 'demote' status in demote reply

* Beepsky prisoner threatcount: status quo

back to what it was since indeed, it becomes a nuisance if he tried to chase prisoners in jail

* Requests done

Removed useless check from secrecordComment, used isobserver at ghost omnihud

* re-add isobserver check

My bad, this check actually gives ghosts the View Comment Log from the HUD where they can't interact with the other buttons. I guess this is exactly why you comment code

* More sane expression on check at secrecordComment

As requested!

Co-authored-by: xXx-RegularJoe-xXx <53127823+xXx-RegularJoe-xXx@users.noreply.github.com>
2020-05-23 11:26:48 -06:00
moxianandGitHub dce6e5b4af Fix paperwork acquiring extra line breaks when you change register (#12652)
* Move paradise-specific customization of marked.js to separate file.

This makes marked.js easily updatable from upstream if need be.

* Fix extra paragraphs being inserted when doing paperwork
2020-05-21 20:12:18 -06:00
datlo be91b68214 Add mime robe, plasmaman wiz outfit 2020-03-26 14:20:04 +01:00
Ty-OmahaandGitHub e691ea2b36 Paper Letterhead (#13155)
* fax letterhead 1

need to add correct paperbins on map and resize logos

* tweaks

* syndicate paper on syndicate base

* code improvements
2020-03-21 17:17:03 -06:00
AffectedArc07andGitHub 210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloudandGitHub 37cc564a1e Merge pull request #12704 from moxian/paper-uid
Make paperwork popups use UID as a window id.
2020-03-07 18:50:54 -05:00
joep van der velden fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
moxian a9c19ebb6b Make paperwork popups use UID as a window id. 2019-11-06 04:40:16 +00:00
Fox McCloudandvariableundefined 5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Fox McCloudandGitHub a0203a60ac Merge pull request #11965 from TDSSS/talisman-icons
Give cult talisman different icons
2019-08-14 19:48:54 -04:00
TDSSS ee79fc139e Made update icon less stupid 2019-08-06 01:52:10 +02:00
TDSSS bbef99ce61 Give cult talisman different icons 2019-08-05 23:01:01 +02:00
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
tayyyyyyy 066343ad31 Support markdown 2019-05-21 13:49:51 -07:00
Fox McCloudandGitHub d61c34e537 Merge pull request #11546 from Shadeykins/Paper-Exploit
Fixes paper.dm issue
2019-05-18 16:26:57 -04:00
Shadeykins 7249cd84b5 Word choice. 2019-05-18 13:24:35 -06:00
Shadeykins 69e50ae70b Fixes potential paper exploit. 2019-05-18 13:21:38 -06:00
Mark van Alphen e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-04-26 22:58:56 +02:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
AffectedArc07 563a951975 SSevents & SSholiday 2019-04-23 10:55:36 +01:00
Mark van Alphen 211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00