Commit Graph

139 Commits

Author SHA1 Message Date
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -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
Jordan Brown
d47686c88e Removes empty New() 2018-03-31 09:11:04 -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
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
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
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
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
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
deathride58
85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -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
LetterJay
35574263b1 Update outlet_injector.dm 2017-12-30 13:23:02 -06:00
LetterJay
70fea88a39 Update cryo.dm 2017-12-30 13:22:54 -06:00
LetterJay
95714a0207 Update volume_pump.dm 2017-12-30 13:22:46 -06:00
YPOQ
a41a508475 Fixes air alarm contaminated mode (#33899)
* Fixes air alarm contaminated mode

* set_filters, paths instead of ids

* Readds gasid2path call
2017-12-29 02:57:42 -06:00
oranges
d960c45e77 Merge pull request #33622 from duncathan/assert_gas
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
duncathan salt
0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
LetterJay
28dfbc7ccc Update volume_pump.dm 2017-12-17 15:57:46 -06:00
LetterJay
2771fe55e4 Update pump.dm 2017-12-17 15:57:33 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
ACCount
435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
kevinz000
606f403c5b Fixes cryo rotation (#32992) 2017-11-25 13:27:38 -06:00
ShizCalev
12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
a8783e5d1f Merge branch 'master' into upstream-merge-32823 2017-11-18 06:06:14 +00:00
deathride58
5f055aa492 Update vent_scrubber.dm 2017-11-18 00:36:11 -05:00
deathride58
d034e7dbf2 Merge pull request #3964 from Citadel-Station-13/upstream-merge-32746
[MIRROR] Atmos Filter/Scrubber UI update
2017-11-18 05:35:27 +00:00
duncathan salt
8bc84c23db fixes scrubbers being unable to scrub 2017-11-17 12:50:42 -06:00
duncathan salt
043e689108 Atmos Filter/Scrubber UI update 2017-11-15 21:38:57 -06:00
ike709
1babecaf3c New vent and scrubber sprites (#32742)
* New vent and scrubber sprites

* Readds OFF and siphon arrow to map sprites
2017-11-15 19:09:21 -06:00
Jalleo
23983c48bf Old debug objects which one has been replaced and another nobody needs at the moment. Also removal of comments that I forgot to removal at _machinery.dm (#32685) 2017-11-14 05:01:25 -06:00
LetterJay
bc23305ef9 Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613
[MIRROR]  Fixes cryo overlay system
2017-11-13 11:50:23 -06:00
nicbn
9ac530dac9 Fixes cryo overlay system (#32613)
* Fixes cryo overlay system

* oops
2017-11-12 19:28:14 -06:00