Commit Graph

103 Commits

Author SHA1 Message Date
CHOMPStation2
14f0302bef [MIRROR] some more spans (#9170)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-06 06:59:27 +02:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-04 15:00:17 +02:00
CHOMPStation2
31407a0be3 [MIRROR] First part of a span rework (#9120)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-02 16:25:48 +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
CHOMPStation2
24658f4b9d [MIRROR] August 2024 various fixes (#8766)
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2024-08-14 02:15:42 +02:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-27 20:17:32 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-16 10:54:47 +01:00
Heroman3003
e62d81af4b [MIRROR] the little construction pr 2023-07-07 07:30:36 +00:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
2f37736638 Merge pull request #12323 from Heroman3003/arcadefix
Fixes arcades not being deconstructable
2022-02-25 23:36:55 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Nadyr
6960aefdc1 powder that makes you say yes 2021-12-05 11:44:40 -05:00
TheGreatKitsune
32ee294814 Fixes the claw machine 2021-10-17 12:52:27 -05:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Novacat
ffe0908dfe Merge pull request #9966 from VOREStation/upstream-merge-7985
[MIRROR] adds ticket redemption
2021-03-18 14:38:42 +00:00
Novacat
1c75b72b58 Merge pull request #9871 from VOREStation/upstream-merge-7938
[MIRROR] The Arcade Machine Update
2021-03-10 00:04:05 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Chompstation Bot
faa287d91b [MIRROR] Adds AlliCo Grab-A-Gift 2020-11-14 07:32:50 +00:00
ShadowLarkens
f61339ee5a TGUI Arcade Battle 2020-09-19 20:41:24 -07:00
Atermonera
8ca03da239 Merge pull request #7403 from dwinters99/mechtoy-and-arcade
Mechtoy and arcade
2020-08-06 14:45:03 -04:00
Rykka
4018d73b3d Critical Arcade Earrape fix pls speedmerge
This prevents arcades from literally deafening you from 10+ tiles away.

They will now only play on your tile and the tile next to you.
2020-08-03 13:57:17 -04:00
Atermonera
3f3bf073e0 Merge pull request #7366 from Rykka-Stormheart/shep-dev-soundstuff
Ambiance and Sound Updates
2020-08-01 23:47:22 -04:00
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
2020-05-13 19:36:01 -07:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Atermonera
0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Atermonera
8ced96e75e Merge pull request #6758 from TheFurryFeline/patch-7
[Oversight] Orion Trail Grammar Fixy
2020-02-28 20:55:06 -05:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
690dc5cbec Merge pull request #4864 from VOREStation/upstream-merge-6010
[MIRROR] Removes spammy keyboard noise from arcade machines
2019-03-28 22:02:21 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
c488a33efd Merge pull request #6010 from Heroman3003/arcade-silencer
Removes spammy keyboard noise from arcade machines
2019-03-22 02:58:33 -04:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Heroman3003
0001b3fe38 Fixed arcades dispensing their own boards. 2018-05-28 09:51:32 +10:00
MarinaGryphon
545cc15849 Adds a message on emag to the battle arcade machine. (#5129)
* Updates one arcade machine emag message to to_chat, adds another.

* Returns 1 in emag_act for orion trail.

* Converts a bunch of stuff to macros. Should probably not break anything.

* Fixes an improper macro usage.

* Attempts to fix all 20 errors.
2018-03-30 19:36:45 -05:00
Schnayy
36236e1883 Sivian Western Sprite Pack (#4970)
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe
2018-02-27 14:24:20 -06:00
Schnayy
02447e5c19 The largest PR I've probably actually done. Adds the following:
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00
Belsima
e61efc752a more gammers (#4052)
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
2017-10-13 23:32:22 -05:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
SinTwo
244fb40de8 Fixes part 1 2016-06-20 23:32:18 -04:00
SinTwo
1e2136781c Adds NanoUI for multiple computers. 2016-06-20 11:48:52 -04:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Mark9013100
6221f69c35 Fixes the description for the Orion trail machine. 2016-02-22 03:29:15 -05:00