Commit Graph

29612 Commits

Author SHA1 Message Date
EdgeLordExe daebb4e401 [READY]Addition of new explosive chems (#47536)
* boomies

* updated some recipes

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

All of these are just grammar fixes

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Changes to the behaviour of TaTP, hydrogen peroxide and acetone oxide, changed acetone peroxide to acetone oxide.

* forgot to // the debug code i used

* further nerfs to potassium and water explosion. Inital nerf wasnt enough. it still had a gibbing potential

* fixed an error

* fixes shit pointed by nemvar owo. Also deleted hexamine, it is replaced by phenol in all of the recipes

* Makes RDX interesting. Explodes uniquely with teslium and liquid electricity.

* oranges said no organ healing chems. so i removed the healing of Penthrite.

* qucikfix

* refixes spelling, thanks wesoda and bobbah for pointing it out

* Apply suggestions from code review

cobby's suggested changes

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Fixes shit pointed out by cobby

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

cobby fix

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Minor change to how rdx works

* Fixed shit i thought i already fixed

* minor error fixed

* again, minor error on my part fixed

* puts penthrite in C2. Removes heart stabilizing effect of corazone.

* minor addition of annotations

* minor fix?

* again minor fix , trying to figure out the merge conflict

* still figuring it out

* github forces me to change the description of corazone into a previous state which is inacurate

* well lets fix it

* fixes the description

* minor fix.. again

* last fix i hope

* removes unnecessary comment
2019-11-13 03:28:32 -08:00
spookydonut dd6fa5eded More spawn/sleep removals (#47634)
* remove more spawns

* more

* more

* varsets

* oops

* unfuck this
2019-11-13 03:07:59 -08:00
Firecage 9543ab6b1c Plants in Gaia'ed hydro trays are no longer taken over by weed… (#47722) 2019-11-13 03:03:56 -08:00
SteelSlayer f0a06e2e9c Some species mutation tweaks/fixes (#47701)
* Species mutation tweaks

* organization

* yes
2019-11-13 02:59:46 -08:00
Mickyan b67fc6e485 Adds a simple framework for mob taming, rideable cows (#47347)
* moo

* chances

* addressed some reviews

* duh
2019-11-12 16:30:59 -08:00
oranges 28e3d6fd8e Revert "Lowers instaflesh's toxicity (#47623)" (#47746)
This reverts commit 7122b4e6f4.
2019-11-13 12:13:27 +13:00
Anonmare 7122b4e6f4 Lowers instaflesh's toxicity (#47623)
About The Pull Request

Instabitaluri's toxicity keeps it from being an effective medication choice as the toxicity is simply too high to be worth it, as toxin damage is simply more painful to treat than brute/burn is.
Why It's Good For The Game

Makes instabitaluri a more attractive medication option and worth the price tag it has in the nanomed.
Changelog

cl
balance: Nanotrasen have refined instabitaluri's formula to be less toxic to living tissue.
/cl
2019-11-13 12:03:49 +13:00
Krysonism 738b4fcae7 Da bottle update. Empty glass bottles, bottle crafting, hooch & moonshine bottles. (#47696)
* bottle bottle bottle

* newline
2019-11-12 17:54:49 -05:00
py01 dcf7afb39d swarmer runtime fix (#47707)
* swarmer runtime fix

* swarmer code cleanup

* code review fixes
2019-11-12 14:21:41 -05:00
skoglol cd017535f4 move delay fix (#47702) 2019-11-12 11:37:00 -05:00
zxaber d8d83ede3c Adds mech thruster equipment (#47554)
* changes

* changes to detach and destroy

Remove code from detach(),
Add code to Destroy()

* added a trailing new line

I guess this is needed now or something
2019-11-12 17:22:06 +01:00
Emmett Gaines a66d42a0bd shuttle fluff change (#30752)
Shoot me if I turn this into another major rework

Adds Donk Co. branding to the shuttle consoles
2019-11-12 09:35:46 +13:00
Tad Hardesty 6bedaca6ce Add period to cable bridge description (#47689) 2019-11-11 11:51:49 -05:00
XDTM 196568e0d1 Timestop prevents speech (#47695) 2019-11-11 11:51:09 -05:00
actioninja 31827f4170 file lineend 2019-11-10 19:21:26 -08:00
RyverStyx 67c16e8af2 Grilling Shorts for Cook and Chefdrobe (#47586)
About The Pull Request

Sprited Grilling Shorts and added them to the Chefdrobe for cooks. These shorts offer no additional stats and are purely an alternative cosmetic for the Chef job.
Why It's Good For The Game

Grilling Shorts are a fun new outfit that chef's and cooks can wear to match their snazzy sandals. They offer no advantage and function as a normal uniform. It is purely for a cosmetic difference.
Changelog

cl
add: Added grilling shorts.
add: Added grilling shorts to chefdrobe.
/cl
2019-11-11 09:19:42 +13:00
XDTM 83469db1e4 Renames the nanite race sensor to species sensor (#47641)
* Renames the nanite race sensor to species sensor

* webedit
2019-11-10 01:34:23 -08:00
spookydonut 3287a48e57 Remove some unused code fragments (#47633)
this is some ancient code that was added in the past as part of 
features that then didnt get removed when those features were 
replaced/removed
2019-11-09 09:35:54 -08:00
Shaps e42c0591b8 Clean up admin moreinfo (#47681)
Agendered spessmen are no longer highlighted on the (?|F) more info 
thing. Also deletes a useless list in preferences file I forgot to 
remove a while ago.
2019-11-09 09:30:31 -08:00
skoglol 778df118e5 Fix shock propagation, add it to fireman carry (#47666)
The electrocute_act refactor made the shock propagating stop working, 
this fixes that. Also adds it to fireman carry, belatedly.

Shocks are fun. More shocks are more fun.
2019-11-09 09:29:10 -08:00
ATH1909 fd502017e5 Fix strange reagent on non-carbons (#47655)
Fixes a bug that was caused by strange reagent assuming that the mob 
that it reacts with is a carbon when it is not, in fact, a carbon.

This bug was causing strange reagent to make dead simplemobs (and other 
non-carbon living creatures, such as cyborgs) that met the conditions 
for revival convulse, but not actually return to life.

As far as I'm aware, strange reagent is supposed to be able to bring 
non-humanoids back to life as well. If it wasn't supposed to do that, 
why would it allow them to convulse?

The only thing that strange reagent needed its target to be a carbon 
for was the regeneration of organs. After its target's organs get 
regenerated, strange reagent then returns to calling it by its 
non-carbon name (M instead of H), suggesting that non-carbons were 
intended to supposed to get past the organ regeneration stage.

Being able to revive cyborgs is admittedly an... odd side effect, but I 
think that this is within reason (or at least a feature instead of a 
bug), since strange reagent can revive fully augged people and androids 
anyway. I could add a(n) !iscyborg() check, but honestly, I think that 
we should let the chemists have some fun. I mean, what's the worst that 
could come from allowing cyborgs to treat strange reagent like an 
emergency cyborg reboot board? About the worst thing that I can think 
of is a medical cyborg teaming up with an engineering, mining, or 
standard cyborg to resurrect a dead cyborg without human assistance, 
but honestly, if a medical cyborg manages to get its grubby mitts(?) on 
some omnizine and holy water without human assistance, find and notice 
the dead status of another cyborg (who actually left behind a "corpse" 
(which cyborgs don't do if they're blown)), and actually coordinate 
with another cyborg with a welder to bring a dead cyborg back to good 
enough condition to be brought back with strange reagent, I think that 
that amount of effort should be rewarded.

It already regenerates your organs so that you don't instantly 
die/start dying again when it revives you, so I feel like it should 
also regenerate your blood level for that same purpose/reason (in other 
words, it should regenerate your blood level so that you don't 
instantly die/start dying again when it revives you).
2019-11-09 09:23:32 -08:00
Arkatos1 73022d0435 Medibots will now keep tending your wounds continuously (#47663) 2019-11-09 09:19:18 -08:00
Loomin d5c114a27d Fix Handholding with simple mobs (#47648)
No erp with Ian please
2019-11-09 09:17:50 -08:00
skoglol c8289281e5 Fix ejecting from lathes through RND console (#47635)
Qust forgot to change this when he added the materials datums.
2019-11-09 09:15:54 -08:00
SteelSlayer 5f1f517212 Antag hud fixes (#47674) 2019-11-09 11:50:30 +01:00
skoglol 769b34fcd8 Adds missing newline in master (#47673)
* Adds missing newline in master

* no tab
2019-11-08 17:53:12 -08:00
Emmett Gaines 4057c7b22c Migrates most machinery update_icon procs (#47284)
* Migrates most machinery update_icon procs

* Removes chargelevel

* Migrates newscaster's overlays
2019-11-08 17:29:23 -08:00
Potato-Masher ccc4300f89 OldStation (Beta/Charlie/Delta) QoL Improvements (#47576)
* Beta/Charlie/Delta station QoL improvements

Atmospherics is now actually a considerable part of Beta station with basic scrubber setup.

Missing atmos pipes added, air alarms are all now unlocked rather than just some, a slight increase in available metal and glass, removed access requirements on engineering external access airlocks, one extra fuel canister, and added light switches and trash cans due to the lack of disposals.

Delta: Added an autolathe to RnD, removed most instances of multiple resin floors on one turf/resin floors in walls, reduced resin spread to be just in the AI chamber, and one extra scrubber in the AI chamber to deal with the miasma buildup after long rounds.

* Minor changes to atmos and added a camera assembly crate in AI chamber

Moved the external filling station port pipes so they are not inside walls, fixed a missing floor decal. Added a camera assembly crate in the AI chamber for making a basic camera network in the event one would like to repair the AI.
2019-11-08 22:28:00 +01:00
Arkatos1 2179dd5c1f New mime spells icons (#47607)
* File, first few spells

* Changed path, more icons, clean dme

* Cleanu and tweaks, finger guns
2019-11-08 22:23:32 +01:00
Rob Bailey ea8292e437 Fixes the laptop vendor, tgui-nextifies it, and adds it to every map. (#47540)
* Lapvendors for Everyone

work

final lapvend

adds lapvend to maps

rebuild

slight ui tweak

small text changes

final

* rebuild
2019-11-08 22:22:33 +01:00
skoglol f41bff2e55 Fixes butchering (#47657)
* Fixes butchering

* list()
2019-11-08 22:19:47 +01:00
Emmett Gaines 041322f222 Cleans up some destroy procs related to remote_materials (#47601) 2019-11-08 22:15:50 +01:00
Couls 971ef6a416 Custom movement hotkeys and restore macros for T, O and M (#47626)
* Custom movement hotkeys and restore macros for T, O and M

* stray comma

* update movement keys on SSinput initialize

* use cardinals
2019-11-07 18:07:17 -05:00
Tlaltecuhtli a68a4cf985 actively made research creates a usable item instead of making them get added to techweb instantly (#47088)
* Update maps.txt

* 1

* 2

* 8============>

* x

* test?

* newline

* d

* sdffsd

* Update code/modules/power/singularity/collector.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-11-07 18:05:48 -05:00
skoglol 907bad84b3 Goliaths drop plates at the ashwalker tendril (#47600)
* Goliaths drop plates at the ashwalker tendril

* Requested changes

* all of them
2019-11-07 12:11:27 -05:00
AnturK c20b4d5ab2 Replaces lentext with length (#47585) 2019-11-07 11:42:33 -05:00
AnturK 17b6569ba2 Replaces mapedited turrets with structures on derelict. (#47584) 2019-11-07 11:35:07 -05:00
Ghom f325b3e5a0 Fixing "walking down stairs shows falling message" (#47588)
* I'm too tired to even PR it atm.

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* atom signal, not movable.
2019-11-07 11:26:43 -05:00
ATH1909 f8f3021ce4 Update bottle.dm (#47595) 2019-11-07 11:24:19 -05:00
Time-Green 2f5326524b fixes reaction chambers sometimes not waking up (#47613) 2019-11-07 10:48:22 -05:00
Rob Bailey 041cde553e fix crafting ui breaking when knowing desserts (#47615) 2019-11-07 10:42:30 -05:00
ATH1909 a7440cc085 G U L P (#47602)
* Update drinks.dm

* Update drinkingglass.dm
2019-11-06 16:19:09 -05:00
SteelSlayer f77d0db3e4 Refactors antag datum hud adding and removing procs (#47573)
* Refactors antag datum hud giving code

* epic fail. this is a much better way to do it

* reduces copy and paste for clown mutation

* review additions

* didn't mean to put that there

* re-add check
2019-11-06 21:30:21 +01:00
skoglol ef2d2796bb Fixes disease outbreak secret (#47541)
* Fixed admin create virus, added target.

* Fixes random and simple disease outbreak.

* requested changes
2019-11-06 20:42:05 +01:00
Rob Bailey 8ea3632a96 global to static (#47580)
* global to static

* get rid of a dead var
2019-11-06 19:49:20 +01:00
Couls 65ce56587c fixes modifier hotkeys and adds alternative move intent toggle (#47569)
* fixes modifier hotkeys and adds alternative move intent toggle

* Fixes pulling keybind

* make the wrappers look more like the old popup windows

* it was the freaking save file

* bump up save file version

* reset keybindings to default
2019-11-06 04:20:30 -08:00
skoglol f7be9f1fd5 Drowsiness now respects sleep immunity (#47566) 2019-11-05 11:23:47 -05:00
Aleksej Komarov 8cf0a9db2c tgui-next: Radio, ORM, Solar Tracker (#47537)
* Radio interface

* Ore redemption machine interface

* Remove candystripe because it looks like shit

* Solar tracker interface

* Add more channels, add full color support to Box

* Cleanup README

* conversion guide draft 1

* Update documentation

* Implement an Input component, update component reference
2019-11-05 02:26:57 -08:00
skoglol a113833452 Fixes holodeck (#47564) 2019-11-05 01:22:40 -08:00
spookydonut 2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00