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
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
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -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
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
ACCount
7aac99d4d7
Fixes air alarm gas thresholds being impossible to change ( #33359 )
2017-12-08 12:08:24 -06:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
ACCount
d883ec3114
Moves pipe meter sprites ( #33122 )
2017-11-28 06:28:31 -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
LetterJay
44d15b07fb
Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607
...
[MIRROR] Alt clicking additions
2017-11-14 15:57:06 -06:00
AutomaticFrenzy
b9c9b87441
Alt clicking additions ( #32607 )
...
Adds alt clicking to lock/unlock for apc and air alarm
2017-11-14 13:49:32 -06:00