Commit Graph

156 Commits

Author SHA1 Message Date
Llywelwyn
f83e4532a3 Adds bounty for a Reuben sandwich (#13833) 2022-05-12 11:24:35 +02:00
SleepyGemmy
7387080448 Reworks Portable Generators (#13663) 2022-05-06 13:59:01 +02:00
Wowzewow (Wezzy)
a65ef5cd26 The Crate Animatening, A.K.A. I hate Crate Trigonometry (#13339) 2022-04-30 02:04:15 -03:00
Doxxmedearly
f175aa1868 Adjusts phoron scarcity bounties (#13561) 2022-04-28 22:04:51 +02:00
alberyk
ad8932a15c Merge branch 'master' into final_master_push 2022-04-09 18:08:53 -03:00
sadkermit
79372075e8 Recreational Drug & Toxins Tweaks & Additions (#13129)
This took way too long.
2022-04-08 16:38:18 +02:00
mikomyazaki
235dca7820 Horizon operations storage will now spawn cargo correctly. 2022-02-19 19:30:27 +00:00
alberyk
a61a4b7e2c Merge branch 'master' into fixes_compile 2022-02-04 14:22:38 -03:00
Casper3667
4820a6667e removes advanced mutation toxin from warehouse spawns (#12912)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2022-01-30 13:19:54 -03:00
alberyk
8cd6f9ca66 Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
#	icons/turf/shuttle.dmi
2022-01-17 22:20:15 -03:00
Matt Atlas
5bcf84cb23 Overmap exoplanet generation, ported from Bay. (#12362) 2022-01-17 22:16:48 -03:00
alberyk
ffc66111e5 uniform 2021-12-29 23:19:44 -03:00
Wowzewow (Wezzy)
527698d6a8 Updates wheelchair code for the new chair-lennium. (#12813) 2021-12-07 13:52:58 -03:00
Wowzewow (Wezzy)
56c16bf208 Colorable Chairs, Stools, and other phoney baloney (#12797) 2021-12-02 22:57:24 +01:00
Alberyk
40838f6a27 Briefcase fix (#12799) 2021-12-01 15:14:58 +01:00
Geeves
22b4874500 Cargo Bounty Tweaks (#12771) 2021-12-01 14:56:39 +01:00
Geeves
2ac4a8051d Powered Crossbow Bounty (#12772)
* Powered Crossbow Bounty

* cl
2021-11-24 13:38:21 -03:00
desven
4168608ad1 Phoron bounty tweak (#12766) 2021-11-21 16:57:03 -03:00
Jaraci
5b5053a79e Adds a new fruity cocktail (#12390) 2021-08-28 18:51:15 +02:00
Doxxmedearly
2faa015445 Canister Bounty Update (#12097) 2021-07-03 18:47:59 -03:00
Doxxmedearly
3acb186b26 Removes Wizard + Conflux (#12067) 2021-06-30 19:55:06 -03:00
Geeves
e0170928f1 Googly Eyes (#11951) 2021-05-28 21:59:30 +02:00
Matt Atlas
68dff443d6 Deletes the clown outfit from the game. (#11722) 2021-04-24 18:24:33 +02:00
Geeves
e3ac75bcbb Inflatables Buff (#11537) 2021-04-22 12:02:11 +02:00
Doxxmedearly
3de819b2b4 Phoron Bounty Update (#11634) 2021-04-17 12:57:32 -03:00
Geeves
016cba448f Colourable Chokhas (#11570) 2021-04-10 18:32:15 +02:00
TheDanseMacabre
1435fdd0c7 Sord-be-gone (#11527) 2021-03-26 10:25:36 +01:00
MarinaGryphon
2a0ab65e64 Bugfix Collection (#11371) 2021-03-04 21:19:10 +01:00
Geeves
cdca8bc98a Welding Kit Reagent Container (#11143) 2021-02-16 09:12:33 +01:00
Geeves
cea438d564 Wristbound Cargo Fix (#11122) 2021-02-04 15:04:49 +01:00
Wowzewow (Wezzy)
f88fdd706d Wrist Slot (Wear watches with gloves!) (#10951) 2021-02-01 11:12:37 +01:00
Wowzewow (Wezzy)
5aba6a91b9 megaphone inhands and some cleanup (#10892) 2021-02-01 09:37:18 +01:00
MarinaGryphon
c720e947ed /decl/chem (#10538) 2021-01-17 00:11:28 +02:00
Doxxmedearly
6be579de4e Warehouse tweaks part 2 (#10961) 2021-01-16 12:39:49 +01:00
Doxxmedearly
51b64f8ac9 just because it's folded doesn't mean it isn't a wheelchair cc (#10829) 2020-12-19 03:08:54 -03:00
Hockaa
878a51e1a6 Gumballs and gumball jars (#10628) 2020-11-26 11:25:43 +01:00
Doxxmedearly
ff2fef90a8 slave for your corporate masters, cargo (#10570) 2020-11-19 22:59:34 +01:00
Jiří Barouš
7c3aa58b6a Changes cargo defines (STOCK_ITEM_*) to fix a deep recursion (and eventual runtime) issue (#10465)
The defines now create a subtype under cargo_master for every spawner
proc and use that to define probability and register the spawner instead
of making tons of proc overrides.

This also allows for more flexibility when defining the spawners if
desired.
2020-11-07 19:31:35 +01:00
JohnWildkins
616776f886 Modular PDAs: The End of an Era (#10319)
PDAs are dead, long live PDAs. All trace of old PDAs has been scoured from the codebase, and in its place are modular computer PDAs that are feature-equivalent. Essentially every PDA function except the Syndicate detonation feature and Notepad has been ported over, and battery life for handheld computers has been boosted alongside the addition of charging cables to make things easier.
2020-11-01 21:09:50 +02:00
Geeves
cf5eee9c7a Cutting Runtime Fix (#10004) 2020-09-15 13:17:03 +02:00
MarinaGryphon
f060df8b24 Cooking Update: Cooking Moona (#9454) 2020-09-02 10:49:14 +02:00
sadkermit
36dc8a5220 Chemical Improvements & Tweaks: Side-effects, overdoses, and more. (#9708) 2020-09-01 14:29:40 +02:00
Alberyk
13f303ce81 Removes mesons and material scanners from the station (#9726) 2020-08-24 13:58:14 +02:00
mikomyazaki
96740c94d2 Pap bounty bugfix (#9677)
Fixes #9673

Should be checking pump pressure not holding tank pressure
2020-08-13 23:00:33 +03:00
Wowzewow (Wezzy)
7114d3525f More new sounds and fixes equip sounds (#9464) 2020-08-12 11:17:39 +02:00
Doxxmedearly
d7156eda93 Are ya feelin' the scarcity now, supply? (#9537) 2020-08-03 12:02:52 +02:00
HouseOfSynth
80c0337430 Deadman implant (#9440)
* Deadman implant

Adds deadman implant and fixes some cargo bounty indentation that I broke without touching or something

* Please love me Travis

Fixes the changelog issue.

* Update code/game/objects/items/weapons/implants/implant.dm

Co-authored-by: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>

* Update code/game/objects/items/weapons/implants/implant.dm

Co-authored-by: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>

* Update code/game/objects/items/weapons/implants/implant.dm

Co-authored-by: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/uplink_kits.dm

Co-authored-by: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>

* Recommended changes.jpeg

thanks doxx!!!

Co-authored-by: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
2020-07-28 17:11:24 +02:00
Doxxmedearly
1ba825dc1e Removes advanced energy gun bounty (#9437) 2020-07-26 16:21:09 +02:00
Chada-1
d7e680a575 Full rename of all real chems to bone apple tea'd versions. (#9400)
As a continuation of #9389
As a bonus, any drugs that mentioned their IRL counterpart in their description now describe their predecessor as ancient, and the new ones as modern. The biggest difference here is just the Antihistamine which was given a full new name. They're similar enough that they'll be recognized (most of them) but different enough for us to call our own and not care what the real medicines are/do since these are our sci-fantasy versions just inspired by them.
2020-07-26 13:19:41 +03:00
Joshie
fb8af14858 Renames all instances of "Norepinephrine" to "Inaprovaline" (#9389)
It was a mistake to use real life chemicals on the grounds of "realism", especially when the chemical doesn't actually act realistically to how it does in real life. With the removal of the Inaprovaline medication as well, we can return the name to Norepinephrine, which was originally called Inaprovaline anyway.
2020-07-21 17:57:44 +03:00