Commit Graph

46 Commits

Author SHA1 Message Date
GDN 9e6dcf9c46 removes the remaining datum redeclares (#25220)
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
2024-04-21 18:26:35 +00:00
Contrabang 9b24572ed5 Updates OpenDream pragma file (#24516)
* hell yeah-coded

* welp im too tired to fix this one

* lets test this

* Revert "lets test this"

* okay, lets test!

* fixes

* okay we good?

* i might be stupid
2024-03-17 11:56:56 +00:00
warriorstar-orion 0667f20681 move all EOL comments on typepath names to dmdoc (#23928)
* move all EOL comments on typepath names to dmdoc

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-03-01 20:05:49 +00:00
Marm e59f0e8aea Makes the Quartermaster a Head of Staff (#22133)
* remote

* more additions

* tgui + ssu

* map edits

* Shut your mug

More changes, huds, mugs and icons.

* mug time

* aaaa

* fixes cere edits

* should fix it

* Update tgui/packages/tgui/interfaces/common/CrewManifest.js

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/game/machinery/suit_storage_unit.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Revert "Update tgui/packages/tgui/interfaces/common/CrewManifest.js"

This reverts commit 5de07cba58.

* mugs all the way down

Fixes locker headset oversight, adds icon for supply management console, new QM mug sprite

* more map changes

* wow this worked?

* Misplaced comma

Removes a misplaced comma.

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Mr QM's Wild Ride

Resolves a number of review comments, including preventing the QM slot being altered by the B/E event, adds a flash to the locker and reverts removal of basic cargo access from the HOP.

* Forgot a var name change, I'm gonna cry edition.

Renames name to board_name for supply ID computer.

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* genesis 1:3

Alters light_color of supply management console to brown_orange from light_color_red

* Update code/modules/events/bureaucratic_error.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* another misplaced comma

Removes a comms where there should not be one.

* saving private ryan

Removes plasmacutter, adds mining GPS and crew monitor to QM locker contents.

* redone map changes

* oop

* the last of it

* merge time

---------

Co-authored-by: GDN <Roanrichards1@Gmail.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-10 20:53:05 +01:00
Marm 7336750e48 Paramedic QOL - Lavaland Edition (#22154)
* paramedic grindset

Adds Paramedic headset with associated encryption key. Gives Paramedic mining access+supply comms. Adds Lavaland corpse related recovery equipment to Paramedic locker.

* goodbye soul hello garment bags

Adds a Paramedic garment bag. Cuts back on Paramedic locker clutter by adding crew monitor and crew pinpointer to loadout.

* headset, i barely know her

Paramedic headset moved out of garment bag and into main locker.

* lore???

Turns out I've been spelling Nanotrasen wrong all this time.

* Update code/game/objects/items/devices/radio/headset.dm

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>

---------

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>
2023-09-01 23:19:41 +01:00
Sadhorizon 83fb15d9df seccomms (#21721) 2023-07-24 15:41:51 +01:00
Henri215 72402e782b Updates the U.S.S.P with new looks and loadouts for admins v2 (#20669)
* Custom USSP roles for admins

* Added the sprites for new USSP

* conflict part 2

* Elder Gods please make this work

* new style for soviet box

* Added Soviet headset

* lets fix this conflict

* Die conflict!

* Sirryan review

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Lets solve this conflict

* Die conflict!

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:16:56 +02:00
warior4356 f2875ead1b Renames to procedure. Moves to X. Fixes color 2020-09-30 14:51:56 -07:00
warior4356 ae818b140d Captain get's oversight by default 2020-09-30 13:16:14 -07:00
warior4356 dbd9ea7be5 Adds Oversight radio to Magistrate, AI, Captain, NT Rep, and IAA 2020-09-29 23:21:27 -07:00
AzuleUtama 09b87516d4 Syndie and Binary keys now use their own sprites (#12347) 2019-09-20 17:59:22 -07:00
AzuleUtama fea9ad2bae Its actually this 2019-01-27 22:08:10 +00:00
AzuleUtama ca957abb62 Binary Key Description Fix 2019-01-27 12:56:06 +00:00
joep van der velden 1b5322c32e Refactor a few small things to make my research level parser work and make the code less odd 2018-12-30 15:18:00 +01:00
alex-gh 7b2ad525e4 Fixes runtime in syndieteam radio. 2018-11-20 04:49:03 +01:00
alex-gh 1ef1933948 Replaced 0/1 with TRUE/FALSE where obvious. 2018-10-26 11:51:59 +02:00
alex-gh c36a997703 Added duplicate name checking. 2018-10-24 14:42:19 +02:00
alex-gh 20f0520398 Fixed nuke ops being anonymized. 2018-10-21 09:50:33 +02:00
alex-gh 6a4d878940 Makes syndicate comm channel pseudonymous. 2018-10-19 14:34:47 +02:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam 24eed4c740 Using the defines 2017-05-27 12:38:24 +01:00
Sam d668cb7bf5 why are they bigger than the headsets they go in... 2017-05-26 22:05:08 +01:00
Kyep 02ffbd084e Creates Syndicate Team Radio Frequency 2016-09-05 03:35:29 -07:00
Kyep 1d24dc1b63 Fixes NTSpecOps Radios
- Changes NT Navy Officer / Special Ops Officer headsets to broadcast to
ERT radio by default, BUT also have the ability to talk to special ops
(deathsquad) radio by using .- (or #-, or #-).
- This fixes a bug where Special Ops Officers can't actually talk to
special ops teams because special ops teams are on a different frequency
to ERTs, and neither of the two channels (ERT or SpecOps) can be
selected with a :X/.X/#X style letter.
2016-07-04 02:52:49 -07:00
Markolie 5e856a0aaf Law manager channel fixes 2015-09-15 23:02:04 +02:00
ZomgPonies b51850dfdd Blueshield access change 2015-03-09 19:01:42 -04:00
Fox-McCloud 7e542873fe Fixes 2015-03-06 01:13:03 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie 60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Fox-McCloud 43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie 38e709e4bd Telescience crystal revert, supervisor access/PDA/headset fixes 2014-12-14 00:46:46 +01:00
Markolie 37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Markolie bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie 0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
Markolie 1269fe7d4e Fix encryption key name 2014-11-21 23:58:13 +01:00
Neerti dd6f54ed47 fun fact: This took 6 hours because bay uses different say().
fun fact: I'm never porting say-related stuff from bay.

Conflicts:
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/radio/headset.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/silicon/ai/ai.dm
2014-07-16 09:27:12 -04:00
ZomgPonies b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
Kilakk 3f172dcd08 Changed ERT headsets to correctly show the Supply channel
* ERT headsets now (correctly) show the Supply channel rather than the two non-existant Cargo/Mining channels.
2013-07-29 22:31:47 -04:00
Cael_Aislinn bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-11 22:12:31 +10:00
ericgfwong@hotmail.com b5b2ee470f Updated supply headset names and instructions
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5267 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 00:46:16 +00:00
ericgfwong@hotmail.com a3780d7021 Renamed Cargo radio to Supply radio
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5266 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 00:16:11 +00:00
ericgfwong@hotmail.com f7abe34c72 Removed mining department radio frequency. Miners and Cargo techs will all be under the Cargo radio instead.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5265 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 23:27:10 +00:00
Cael_Aislinn eacd84b212 Merge tgstation13 r4570 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 19:57:11 +10:00
johnsonmt88@gmail.com d36387607f More file structure stuff.
- The folders themselves are now finished
- Next I'll go through each file and organize them
- Lastly I'll start pulling the object definitions out of /code/defines/ and put them into their respective files.

**Note to committers**
Make sure the .dme file updates when you update to this revision. If necessary delete the .dme and svn-update.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4546 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 01:20:02 +00:00