Commit Graph

384 Commits

Author SHA1 Message Date
LetterJay
69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
2018-05-27 01:32:02 -05:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 07:38:01 -05:00
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-24 11:58:57 -05:00
LetterJay
d45c85bf78 Merge pull request #6854 from Citadel-Station-13/upstream-merge-37968
[MIRROR] Field generators are now workable by silicons again... but not wirelessly
2018-05-23 06:45:37 -05:00
kevinz000
7fb7873bf3 Update field_generator.dm (#37968) 2018-05-22 22:12:22 -05:00
cyclowns
f37865ee6c Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-22 22:11:23 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
kevinz000
d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -05:00
81Denton
0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
Tad Hardesty
021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
LetterJay
893783188f Merge pull request #6672 from Citadel-Station-13/kevinz000-patch-1
tesla coil runtime fix
2018-05-07 09:20:42 -05:00
kevinz000
33e6ef93f1 runtime fix 2018-05-06 20:17:15 -07:00
Jordan Brown
81deaaca6d Merge pull request #37648 from vuonojenmustaturska/apcunsmash
Moves removing the cell to screwdriver_act for APCs
2018-05-06 16:37:04 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
vuonojenmustaturska
49150c542f Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035)
* APC crap

* moar define

* honk

* cover defines
2018-05-02 01:32:34 -05:00
AnturK
76302a217e Readds missing nuked narsie cinematic. (#37584) 2018-05-01 11:05:16 -05:00
Jalleo
987cce76ed [s] Small tweaks and fixes a edgecase with machine construction (#37494)
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
2018-04-30 05:00:24 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
LetterJay
c287c3a84c Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483
[MIRROR] Fixes obj descs and adds missing ones
2018-04-29 02:29:44 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
81Denton
b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
Emmett Gaines
620c1fcbb8 set waitfor in final countdown (#37453) 2018-04-27 13:02:09 -05:00
deathride58
5a399f4ce9 Merge pull request #6506 from Citadel-Station-13/upstream-merge-37411
[MIRROR] Improves logging/messaging for singularities.
2018-04-27 09:30:18 +00:00
LetterJay
72ddaee4a3 Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363
[MIRROR] Makes radiation collectors buildable
2018-04-27 00:10:52 -05:00
Dax Dupont
5014bdf6ee Improves logging/messaging for singularities. (#37411) 2018-04-24 10:19:14 -05:00
Dax Dupont
d5c2d37e39 Makes radiation collectors buildable (#37363)
* Makes radiation collectors buildable

* capitalism at it's finest

* a
2018-04-24 07:13:16 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
LetterJay
ca7bc589d9 Merge pull request #6429 from Citadel-Station-13/upstream-merge-37207
[MIRROR] Fix grammar in lightbulb shatter message
2018-04-22 02:39:18 -05:00
vuonojenmustaturska
32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
2018-04-18 09:33:31 -05:00
Tad Hardesty
09cf7216b2 Fix grammar in lightbulb shatter message (#37207) 2018-04-15 22:43:54 -05:00
Denton
0ada58dd4f oof 2018-04-11 14:59:54 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
Spirono
29fcf2d5aa Wrench Supermatter Shard to the ground (#36991)
* Temporary concept code for PR

I doubt this code is the standard method of doing things, but trying to understand this code is a bit AIDS

* Using wrench_act() and default_unfasten_wrench() instead

It actually works this time
2018-04-08 16:59:25 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Jordan Brown
d27541d5fb Merge pull request #36840 from 81Denton/singulo-power
Fixes singularity power output
2018-04-01 00:18:37 -05:00
CitadelStationBot
0016b323f6 [MIRROR] Lowers damage cap on breaking hacked apcs (#6026)
* lowers damage cap on breaking apcs (#36520)

* Lowers damage cap on breaking hacked apcs
2018-03-19 21:44:19 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)

cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
deathride58
02c3f6d0a0 Merge pull request #5985 from Citadel-Station-13/upstream-merge-36399
[MIRROR] Fixes the tesla coil research screwdrivering
2018-03-18 00:18:55 +00:00
deathride58
b9a73ded87 Update coil.dm 2018-03-17 19:48:42 -04:00
RandomMarine
c1e897b298 Tesla coils and grounding rods actually shock buckled mobs. (#36437)
* coils and grounding rods shock buckled things

* general tesla buckle shock proc
2018-03-17 08:49:38 -05:00
vuonojenmustaturska
a4e10653c7 Fixes the tesla coil research screwdrivering 2018-03-17 08:30:54 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot
d97c2bc134 [MIRROR] Constructed turbines now properly connect_to_network() (#5889)
* Constructed turbines now properly connect_to_network() (#36222)

* Constructed turbines now properly connect_to_network()
2018-03-10 07:34:28 -06:00
Poojawa
9785222155 tweaks Tesla Point income (#5849)
* reigns in excessive point creep

* actually do math on this shit.
2018-03-10 07:12:24 -06:00