Commit Graph

268 Commits

Author SHA1 Message Date
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
CitadelStationBot
c168c1582e [MIRROR] Speed up space wind by avoiding noop proc calls. (#5763)
* Speed up space wind by avoiding noop proc calls. (#36072)

During times of high numbers of active turfs on station, this proc tends to cost more per turf then process_cell does, avoiding noops is really the only easy speed up opportunity i can see here unless i wanted to make a flag for rather or not experience_pressure_difference is called so only movables that override the default behavior (livings really) get the proc called on them

* Speed up space wind by avoiding noop proc calls.
2018-03-03 02:32:45 -06:00
deathride58
b0ca7f2aaa Merge pull request #5704 from Citadel-Station-13/upstream-merge-35667
[MIRROR] [s] Fixes tritium rad_pulse overload
2018-02-25 21:40:41 +00:00
Buggy123
924463b7a5 [s] Fixes tritium rad_pulse overload (#35667)
* Crashing the server is bad, mkay?

* BYOND PLEASE THIS IS KINDA IMPORTANT
2018-02-25 14:49:18 -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
Jordie
fe63a4527f Merge pull request #35660 from Iamgoofball/patch-397
[s] Trit no longer makes radiation
2018-02-14 19:14:14 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
Buggy123
0c9bb1a249 Tritium now produces water vapor when combusting. (#35354)
* HYDROGEN+OXYGEN=WATER

* Burning Tritium now produces a lot of radiation.

* Fixes check and line positions

* No longer spews absurd quantities of radiation.
2018-02-12 21:11:22 -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
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -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
deathride58
406df3ae92 Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076
[MIRROR] Fixes diagonal movement in pipes
2018-01-08 04:18:06 +00:00
Emmett Gaines
65afc4d2b2 fixes diagonal movement in pipes (#34076) 2018-01-07 20:34:18 -06:00
Jordan Brown
1e4a6dd26b Merge pull request #34118 from MrStonedOne/patch-459
Reduces the memory footprint of the gas_mixture datum
2018-01-07 19:58:35 -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
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -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
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
deathride58
b4321a1dbe Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636
[MIRROR] restores reaction max_reqs checking code
2017-12-21 03:44:57 +00:00
deathride58
59947b4b3b Merge pull request #4424 from Citadel-Station-13/upstream-merge-33632
[MIRROR] properly disables fusion
2017-12-21 03:43:30 +00: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
Jordan Brown
50bd078b43 Merge pull request #33636 from duncathan/max_reqs
restores reaction max_reqs checking code
2017-12-18 15:15:09 -06:00
LetterJay
28dfbc7ccc Update volume_pump.dm 2017-12-17 15:57:46 -06:00