Commit Graph

95 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot 938e760841 [MIRROR] Gets rid of hasvar usage and moves up some vars (#11484)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-08-23 13:04:52 -04:00
CHOMPStation2StaffMirrorBot 667e08ee0a [MIRROR] Kitchen Sink PR (#10745)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-04-26 19:16:57 +02:00
CHOMPStation2StaffMirrorBot 7bfffc808d [MIRROR] Adds Trait Genetics (#10142)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-02-13 15:41:59 +01:00
CHOMPStation2StaffMirrorBot 2d0719a4d4 [MIRROR] some dropped sanity (#9856)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-01-12 17:34:37 +01:00
CHOMPStation2 45025bd128 [MIRROR] Ports tgstation/tgstation/pull/15673 (#9270)
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-10-20 23:08:28 +02:00
CHOMPStation2 5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084)
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-09-30 21:36:41 +02:00
Guti 3ab65695ab Crawling (#7822) 2024-03-02 17:01:30 +01:00
Drathek aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2 aab270c74f [MIRROR] remove static chat colour tags (#7635)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
2024-01-29 18:45:19 -05:00
Heroman3003 5ec0facd50 Merge pull request #14365 from VOREStation/upstream-merge-8892
[MIRROR] Cleans up drop_from_inventory(), fixes drake harness population.
2023-01-22 01:47:46 +00:00
Casey ece7dbb2f2 Merge pull request #14235 from Heroman3003/inventory-fix
Fixes critical inventory equipment bug
2022-12-24 06:25:59 +00:00
Casey de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Aronai Sieyes 99d4db145d Merge pull request #11499 from VOREStation/upstream-merge-8233
[MIRROR] Ports sliding things along tables
2021-08-26 20:17:48 +00:00
Chompstation Bot 275458f14a Port in-game painting from /tg/ 2021-07-03 22:31:15 -04:00
Aronai Sieyes 64db1a458b Merge pull request #10802 from VOREStation/Icons/food
Port several foods and food sprites
2021-07-03 20:31:07 +00:00
Aronai Sieyes c77619f520 Merge pull request #10767 from VOREStation/Arokha/EEquip
Improve E-quip hotkey
2021-06-30 19:35:59 +00:00
Novacat b3545f16e1 Merge pull request #10009 from Verkister/patch-43
Fixes a thing that somehow never got mirrored here
2021-03-24 12:30:45 +00:00
Novacat 6be0583994 Merge pull request #9565 from VOREStation/upstream-merge-7801
[MIRROR] Corpse Landmarks Update pt1
2021-01-12 03:53:39 +00:00
Atermonera 0ebcca246e Merge pull request #7518 from Meghan-Rossi/borgcookfix
Fix cyborgs not being able to cook
2020-08-21 01:25:40 -04:00
ShadowLarkens 3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Atermonera 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Neerti 22954a5a04 QoL: Hacking (#6810)
* Makes hacking window consider all hands instead of just the active one.

* Makes bottom indicators in hacking window go bold if they changed since the last refresh.

* Changelog
2020-03-11 20:36:42 -04:00
Atermonera 11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Atermonera a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Leshana a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-03-15 22:41:14 -04:00
Arokha Sieyes 2970b37fa1 U_I Phase 2.6: Blood, Helmets, Unneeded calls 2018-03-08 19:34:01 -05:00
Arokha Sieyes 53a185f838 U_I Phase 2.0: Code cleanup
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05:00
Arokha Sieyes 4538a6859f POLARIS: Use drop_location() for things 2018-03-08 13:03:09 -05:00
Arokha Sieyes f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Neerti 96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527)
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
2018-01-14 14:58:15 -06:00
Cameron653 e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Nerezza f94bf5c18f Fixes runtime in inventory.dm
Clicking an inventory slot with nothing in your active hand would runtime. Now it checks to make sure you have something in your active hand, and if not it returns 0.
2016-11-21 20:36:39 -06:00
PsiOmegaDelta 2007c143d2 Refactors the forceMove() drop.
Makes dropping a its proc instead, cleaning up forceMove() handling.
2016-09-15 17:11:57 +01:00
Jon 21f898e047 First commit of manual port of BS12
#13042
and
#13086
2016-05-29 00:56:11 +01:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Neerti 3ea6635f6a Fixes two very common runtimes
Fixes some null.Topic() runtimes caused by AI hotkeys.
removeItem() now checks if the item actually exists before modifying variables.
2016-05-02 00:46:31 -04:00
Chinsky 11b7a38cf4 Makes inventory slots forward clicks to items in them. In effect that means you don't have to pixelhunt item in the slot, just click the slot. Smoking cigs is easy mode now. 2016-04-22 20:39:45 +01:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Zuhayr 7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr 98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr 36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-22 01:33:09 +10:30
Zuhayr f89948d666 Added functionality for two-handed gun use. 2016-01-21 00:51:54 +10:30
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
PsiOmegaDelta 2e89b7c718 Fixes the canUnEquip() proc.
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
2016-01-02 16:59:16 +01:00
Zuhayr 6e8368ac4c Rewrote targeting. 2015-12-16 10:26:40 +10:30
Zuhayr 7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Neerti 865f4b1d38 Revert "Comments out clothing coverage." 2015-10-31 04:15:36 -04:00
Mark9013100 61f9608324 Comments out clothing coverage.
Comments out the slot_is_accessible flag.
2015-10-30 13:45:43 -04:00
PsiOmega 5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00