36 Commits

Author SHA1 Message Date
Casper3667 2ef91b3bf3 A bundle of smaller bugfixes (#21882)
-  Assunzioni Sera Stellata di Dalyan Wine can be ordered again.
- Sandals now default to being wood colored if not otherwise given
color.
- Added camera film to the toy shelf storage and briefcases and canes to
the clothing shelf storage.
-  Fixed that the operations lobby was powered by the wrong grid.
-  Added some custom items to the merchant blacklist.
2026-02-19 11:25:30 +00:00
naut dfe57a310f New boxes (#21439)
* Thoroughly resprites boxes. They're now more modular and, importantly,
colorable.
* Resprites cardboard, as a material.
* Repaths boxes behind the scenes to be more object-oriented, with boxes
being resorted into their own subtypes. You might notice this in the
gargantuan amount of files this PR changes.

Part of a bigger (yet modestly-sized still) resprites project. Atomized
the boxes bit into this PR specifically so that any conflicts don't
destroy any other spriting PRs.

<img width="652" height="273" alt="image"
src="https://github.com/user-attachments/assets/5590b22d-c9d7-49b5-9adf-0b6e01a6962b"
/>

<img width="383" height="345" alt="image"
src="https://github.com/user-attachments/assets/aab83040-2d5d-4283-b019-3d6bed2e3e47"
/>

<img width="142" height="343" alt="image"
src="https://github.com/user-attachments/assets/75a98d36-0171-4e48-9dec-de5511f35d39"
/>

<img width="127" height="225" alt="image"
src="https://github.com/user-attachments/assets/a1ff8b1b-bd2a-4c0d-b538-32fe401724c3"
/>

<img width="334" height="399" alt="image"
src="https://github.com/user-attachments/assets/e41330ac-ed4a-4e81-a87a-5ba901b47b5c"
/>
2025-10-07 16:59:55 +00:00
lavillastrangiato c03efa6661 Changes mentions of New Ankara to Tabiti (#19609)
As per NEWLORE.

---------

Signed-off-by: lavillastrangiato <63124803+lavillastrangiato@users.noreply.github.com>
Co-authored-by: La Villa Strangiato <mangodeity@gmail.com~>
2024-07-27 10:09:52 +00:00
LynxSolstice 4a45d5454b Return of the Paramedic (#19125)
This PR brings back the more accurate title for First Responders, of
Paramedic, to bring it in line with some snippets of the SOP and to be
more accurate to the role itself, as both Security Officers and the rare
and elusive Firefighting Atmospherics Technician can be considered first
responders.

also I just like it better.

Changes any mentions of first responder in gear/access/etc to Paramedic
or PARAMEDIC where applicable.
2024-06-14 21:05:34 +00:00
Ben 47ae292bac Merchant Traders now have greetings for Species + Biases (#18825)
Traders used to only do greetings based on each subspecies, due to
significant overlap for some (ie, IPCs), functionality added for traders
to greet based on general species, if a specific subspecies is not
found.

Adds new defines for each species that is a list that has all subspecies
for them (ALL_IPC covers all frames for examples)

Biases for Species
DENY: "No service for Bots here"
UPCHARGE: Service, but prices higher
DISCOUNT: Special prrrices forrr comrrrades

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-05-01 22:35:49 +00:00
Alberyk 180a9c081d Fixes the dpra brooch, some pistols and a trader item (#18170)
* Fixes

* changelog
2024-01-07 11:26:17 +00:00
Wowzewow (Wezzy) 462115b501 The Pumped Up Kicks Update (#16265)
* The Pumped Up Kicks Update

Shoes. New shoes. Look at them.

* WELCOME TO THE UNDERGROUND

* for the love of crust

* turns out a var already existed for that but was never implemented ffs

* face it you're never going to make it

* these are winter boots

* removes Paradox's Thinly Veiled Fetish

* shiit

* Apply suggestions from code review

* Update code/modules/clothing/shoes/oxfords.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* oops

* fuck this file

* nice balls, bro

* check out how hard i can pee

* pissing on the moon

* caligaeae

* pee pee poo poo man

* fixes

* damn you

* merge fixes

* knees more

* damn you merge conflict

* fix

* fixes 2

* riding boots

* truly, this fixes things

* dammit ctrl s

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-13 11:29:03 +00:00
Cody Brittain 8c2c1c08f1 Frontier Cowboys now receive a lever action rifle (#17156)
* Frontier Cowboys now receive a level action rifle

* Icon and sounds for the Lever Action

* CL

* Attribution

* Added updated sprites by suethecake

* Ensure internal consistency
2023-08-30 22:36:52 +00:00
Alberyk 5acde845cb DPRA gun update (#16143) 2023-04-03 10:47:23 +00:00
Alberyk c0dbe3e275 Merchant NBT Update (#14603) 2022-10-09 17:59:21 +02:00
TheDanseMacabre ed43343dcc Various removals. (#14135) 2022-07-17 22:12:11 +02:00
BLUNTFORCE420 e8a179070a Resprites the automatic .45. (#12391) 2021-08-29 22:33:30 +02:00
Alberyk f66d8b9d83 Space Sector: Badlands (#11985) 2021-08-05 13:03:49 -03:00
Alberyk da4f065701 Where No Spaceman Has Gone Before: a space sector system (#11801) 2021-05-31 00:32:07 +02:00
WickedCybs 0bce70a4b0 Antag-Focused Medical Additions + Minor Bonus Responder Stuff (#11742) 2021-04-28 16:42:52 +02:00
WickedCybs 679d81440b Adds a Ballistic Carbine (#11695) 2021-04-22 12:01:46 +02:00
Matt Atlas cc0171f154 Adds plate carriers, restyles all current station armor to plate carriers, turns arm guards and leg guards into accessories. (#11230) 2021-02-21 15:12:17 +01:00
Alberyk 1a98599edd Adds a freeze ray gun (#11114)
This pr adds a freeze ray gun. It works by reducing the mob's temperature until they freeze and get stuck inside ice for a while. The gun also has an alt-fire mode that fires ice bolt.
2021-02-06 17:45:46 +02:00
Alberyk 59a3ed600b Bad Moon on the Rise: A Farewell to Arms edition (#9715) 2020-08-22 11:22:56 +02:00
Alberyk 1910c1defb Mandatory yearly gun pr: 2020 edition (#8001)
-adds the harpoon gun, to the merchant list and as a raider weapon
-adds the foldable shotgun, to merchant list and as a raider weapon
-adds a new sprite and firing sound for the silenced pistol, giving it to the dpra consular as well
-makes harpoons better as a throwing weapon
-tweaks some guns' names
2020-01-15 17:51:36 -03:00
Alberyk 038a4ac86b Tajaran update: the war to end all wars edition (#7638)
-changes how the tajara species handles citizenship in game: you now have to pick one of the three factions, this also enables consular officers for them
-adds a new var to the species: default_citizenship, which citizenship should be the default one for that species, so you can have species that can't get biesel citizenship as their main one
-adds a bunch of loadout options to the tajaran section
-restricts tajara from being necropolis contractors
2019-12-21 12:58:34 +02:00
Alberyk beb35d6fd3 Adds two away missions ghost roles (#7450) 2019-11-21 20:55:59 +01:00
Werner af16a489a6 Removes Weapons (#7415)
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
2019-11-16 18:36:13 +01:00
Alberyk b0e6ece48b Gun update: the end of the space cold war (#6742)
-replaces the sprites of the guns that were pretty much justreferences to guns in real life, like the uzi and the dragunov, with new future sprites made by kyres
-adds the hand cannon
-makes some guns cheaper at the merchant
-fixes a broken message with the prank guns
-added a small animation when someone is hit by a blaster projectile
2019-07-24 21:31:09 +03:00
fernerr 77c262e9a2 Security and Central command uniforms sprite overhaul (#6560) 2019-06-18 00:28:53 +02:00
Werner 0feedab118 Leyon Changes (#5200)
The Leyon Pistol has been changed to be closer to the original vision of it.
It is loaded via a special 10mm speedloader, however loading it takes some time.

Each gun (when ordered via cargo) will ship with a speedloader.
The speedloaders itself can not be ordered, but 10mm ammunition boxes can which can be used to restock the speedloaders or load the gun directly.

Reduces the price for the gun at the merchants from 1500 to 500 credits
And makes additional ammo boxes purchaseable

Also changes the path name of the 10mm ammo/mags/... to be consistent with the standard pathing for ammo
Adds additional messages if you can not load a gun with a single cartridge (currently it fails silently)
2018-09-16 00:46:52 +03:00
Alberyk bf467f2fcd August bugfixes (#5096)
-removes the shotgun magazines things, not done properly by #5010
-fixes more secret chems showing up on cargo warehouse
-removes rainbow slime core, since there is no way you can get it, from the bounties
-fix the adhomian bread recipe
-removes the mining drone ore hunting behavior, which just ended with them falling down holes and other dumb things
-fixes #5097 by removing the bluespace leak ruin, since the bluespace walls had some bizarre interaction with simulated turfs in the asteroid, besides just pushing half of the loots into walls
2018-08-07 09:01:42 +03:00
Alberyk 047c3a4c83 Gun update 2018: mk II (#5010)
-removes the shotgun magazines, moving their sprites to the boxes instead
-shotguns boxes should now all have eight shotgun shells, up from seven
-added incendiary and emp shotgun shells boxes
-added the baindolier, a belt that can hold up to 16 shotgun slugs
-fixed a bug with unloading the pocket rifle
-added empty sprites for the uzi and a different loaded gyro pistol icon
-updates some gun related merchant lists a bit
-adds the weapon suggested by this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11486
2018-08-02 01:01:26 +02:00
Alberyk b142056c0f Merchant related fixes and tweaks (#4891)
-fixes an exploit to allowed merchants to make dash money due to how the pet trader worked, it should now sell all mudane animals and buy only rare ones
-removed some items that could not be moved from the merchant list
2018-06-26 23:17:05 +03:00
Alberyk d44ff1363b "Fix bayonets!" (#4872)
This pr adds bayonets, knives that you can attach to some rifles. When attacking someone in melee with the rifle, you will attack your target with the bayonet instead of the rifle itself. Sprites are from tg and baystation.

Also, fixes the vintage rifle having no in hand sprites
2018-06-16 16:46:42 +03:00
Alberyk 2116c17961 Adds the icelance rifle (#4804)
This pr adds the icelance rifle, a tajaran energy weapon. It has the capacity of three regular laser blasts, but it can be recharged manually by rotating a crank on it. You can buy it from the merchant or get it as a raider.

Thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11215

Sound is from https://freesound.org/people/kikuchiyo/sounds/214851/

Sprites were made by dronz.
2018-06-05 22:26:20 +03:00
Lohikar da3af646d6 Bolt-action refactor (#4667)
Makes bolt-action rifles a child of pump-action shotguns again to remove some shared code.
2018-05-02 21:24:32 +03:00
Alberyk b58a3037c1 Some small fixes and tweaks (#3933) 2017-12-08 17:10:02 -06:00
WrongEnd 73a10d20e2 Adds pranks, jukes, and anal retentive bolt action rifles (#3664) 2017-11-10 23:53:01 -06:00
Alberyk 62f142e215 Gun update; new icons, more guns and better code organization (#3434)
-ports some gun and gun mechanics from polaris and bay such as the Lemant revolver, capguns sprites
-collapses svd.dm and scout_sniper.dm into sniper.dm
-renames boltaction.dm to rifle.dm
2017-09-18 22:22:09 +03:00
Alberyk b4fa4a8b3a Baystation12 merchant port (#3155)
Port of the merchant mechanics from baystation12.
All of the trader, prices and most essential system are done, as well the job datum and the like. Mapping the shuttle, the base and a new dock will be done in a later pr.
Also adds phazon construction and several other items used in this pr.
The chance of the merchant slow being open at round start can be changed via the config, it is 20% by default.
2017-08-04 21:36:04 +03:00