Commit Graph

227 Commits

Author SHA1 Message Date
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
as334 9b36d6c4d9 Re-adds and reworks fusion. (#37384)
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 01:01:47 -05:00
Dax Dupont 4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
deathride58 909be55c5f Merge pull request #6497 from Citadel-Station-13/upstream-merge-37341
[MIRROR] Adds multilayer pipe subtypes for mapping
2018-04-27 09:29:04 +00:00
81Denton 8fdc520031 Adds multilayer pipe subtypes for mapping (#37341)
* adds multilayer pipe subtypes for mapping

* replaces values with defines
2018-04-23 10:33:20 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
pigeons 4d0597ad5b Parenthesizes some macros (#37212)
* parenthesizes some macros

* A couple more macro definition parenthesizing
2018-04-16 03:47:46 -05:00
vuonojenmustaturska 472e7f7f61 Allows passive gates to be touched in unpowered areas 2018-04-15 12:41:28 -05:00
deathride58 5f81921fa6 Merge branch 'master' into synctesting 2018-04-08 03:41:50 +00:00
CitadelStationBot 43baad50f1 [MIRROR] Add on-map sprites for pre-enabled atmos pumps (#6300)
* Add on-map sprites for pre-enabled atmos pumps

* Update volume_pump.dm

* Update pump.dm
2018-04-07 22:38:32 -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
LetterJay cccab00fed Merge pull request #6134 from Citadel-Station-13/upstream-merge-36230
[MIRROR] Pipenet fix
2018-04-01 01:01:42 -05:00
Jordan Brown d47686c88e Removes empty New() 2018-03-31 09:11:04 -05:00
Dennok 30d5f3af17 Pipenet fix (#36230)
* Pipenet fix

Fix of Runtime in components_base.dm,91: Cannot read null.parents  proc name: returnPipenet
Return working releaseAirToTurf() on pipe Destroy()
Block of self  merge what cause pipeline anihilation.

* up

* maintainer abuse
2018-03-28 12:14:47 -05:00
CitadelStationBot d4738d4676 [MIRROR] Fixes air alarm values (#6103)
* air alarm values (#36629)

* Fixes air alarm values
2018-03-26 04:29:12 -05:00
CitadelStationBot 83a2cda51f [MIRROR] Fix ventcrawl breathing and visuals (#6069)
* Fix ventcrawl breathing and component icons (#36591)

* Fix ventcrawl breathing and visuals
2018-03-22 06:12:07 -05:00
CitadelStationBot 2fbdfd1856 [MIRROR] Atmos unary devices can now be analyzed (#6037)
* Atmos unary devices can now be analyzed (#36485)

tweak: Unary devices can now be analyzed using gas scanners. This means stuff like vents, scrubbers, cryo tubes, or heaters/freezers.


fixes #36448

this means stuff like cryo, vents, scrubbers, heat exchangers, heaters/freezers, injectors, those big pressure tanks etc. can now be analyzed by gas analyzers/PDA gas scanners

* Atmos unary devices can now be analyzed
2018-03-21 12:58:24 -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
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
Poojawa 57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
Poojawa 86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
Jordan Brown caa59d936f Merge pull request #36108 from tgstation/duncathan-patch-1
better addresses the gas miner active turf issue
2018-03-04 15:39:08 -06:00
ShizCalev d7409f92c0 Easy tanks in canister replacement (#36066) 2018-03-03 03:42:08 -06:00
Jordan Brown 1642f549ad Removes definition redundancy 2018-02-25 13:22:54 -06:00
CitadelStationBot 3023fd874c [MIRROR] Fixes gas meter layering (#5686)
* Merge pull request #35877 from ShizCalev/GAS-METER-LAYER-FIX

Fixes gas meter layering

* Fixes gas meter layering
2018-02-24 06:07:07 -06:00
CitadelStationBot 567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
CitadelStationBot 54889864ab [MIRROR] Hopefully fixes gas miners (#5628)
* Merge pull request #35828 from tgstation/Cyberboss-patch-2

Hopefully fixes gas miners

* Hopefully fixes gas miners
2018-02-21 09:27:30 -06:00
CitadelStationBot b3266870a6 [MIRROR] Fixes some tool interactions (#5555)
* Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks

Fixes some tool interactions

* Fixes some tool interactions
2018-02-17 17:46:46 -06:00
Jordan Brown f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalev f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
BordListian 9b910552fd Forces gases to obey certain laws of nature (#35277)
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-07 02:32:31 -06:00
Poojawa a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown f0b02fac56 Merge pull request #34501 from AutomaticFrenzy/patch/mapping-scrubbers
Allow mapping non-default scrubbers
2018-01-19 09:38:04 -06:00
Jordan Brown 9df836baca Merge pull request #34479 from F-OS/patch-5
newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
2018-01-16 08:29:24 -06:00
ShizCalev 8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00
ShizCalev 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Leo ba1f61cb9e Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime
Fix RPD runtimes and offsets of layered connector ports
2018-01-13 08:58:44 -06:00
Leo e11e4b3385 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar
Fix description of relabelled canisters
2018-01-12 07:03:20 -06:00
deathride58 e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Emmett Gaines 65afc4d2b2 fixes diagonal movement in pipes (#34076) 2018-01-07 20:34:18 -06:00
deathride58 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
deathride58 d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
ShizCalev 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
Leo fdfa61c1c8 Merge pull request #34107 from ShizCalev/canister-sprite
Fixes relabeled canisters reverting sprites when broken
2018-01-06 08:51:32 -06:00
deathride58 0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00