Commit Graph

217 Commits

Author SHA1 Message Date
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
kevinz000
0a39366f1a Update flash.dm 2018-08-27 17:57:05 -07:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
kevinz000
6b1dbf8561 Update flash.dm 2018-07-16 15:33:53 -07:00
deathride58
0235f37fd0 Merge pull request #7339 from Trilbyspaceclone/patch-3
Adds more to the Autodrobe coin slot!
2018-07-10 02:00:06 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBot
f393d68499 [MIRROR] fixes anomaly cores being flamable (#7207)
* fixes anomaly cores being flamable (#38607)

* oranges-is-gay

* swap

* fixes anomaly cores being flamable
2018-06-20 22:40:54 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
deathride58
0e3d5a7512 Update infrared.dm 2018-06-09 00:35:13 -04:00
AnturK
2675481198 Fixes infrared emmiters partially. 2018-06-06 14:26:34 -05:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
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
36b3cbe4bf Removes a couple thousand empty lists (#38000)
door.shockedby
2018-05-23 21:15:41 -05:00
Hatterhat
939e289c3e KNEE 👏 JERK 👏 RE 👏 VERT 👏 "fixes flash icons" (#6861)
* Revert "Automatic changelog generation for PR #6860 [ci skip]"

This reverts commit 1b5238e58e.

* Revert "fixes flash icons (#6860)"

This reverts commit 88382c1058.
2018-05-23 12:06:11 -07:00
Hatterhat
88382c1058 fixes flash icons (#6860)
because people keep whining about it and because kev wanted me to do it for him with a webeditor pr
2018-05-23 11:56:34 -07: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
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -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
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558
[MIRROR] Anomaly Armour Research
2018-05-12 21:36:51 -05:00
YPOQ
f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
KorPhaeron
cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
deathride58
be42e97101 Update helpers.dm 2018-05-07 08:47:44 -04:00
ShizCalev
6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
LetterJay
4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447
[MIRROR] Fixes mousetraps not going off from being dumped out
2018-05-05 09:38:11 -05:00
kevinz000
4a7fae664e Fixes mousetraps not going off from being dumped out (#37447)
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
2018-05-04 04:43:12 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Jordan Brown
61263daa0b Merge pull request #37625 from ShizCalev/infrared
Updates infrared emitters to use the rotate component
2018-05-03 08:44:01 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -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
PKPenguin321
41b90f01e2 READY flash fixes (#36920)
* flash fixes

* switches to get_turf

* fixes the fix

* parent call and comment

added the comment so it doesnt get removed again by accident
2018-04-06 04:05:19 -05:00
XDTM
75187908a3 Fixes strobe shields' icon getting stuck (#36714)
* Fixes strobe shields' icon getting stuck

* src instead of get_turf(src)
2018-03-28 13:42:48 -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
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814)
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
2018-03-05 15:20:49 -06:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710)
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
2018-03-05 12:34:01 -06:00
CitadelStationBot
4351621e7d [MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673)
* Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells

* Enables the RPED to construct/replace beakers, igniters and bluespace crystals
2018-02-23 17:42:24 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -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
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
LetterJay
6066ab31dd Update igniter.dm 2018-01-23 08:20:27 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
kevinz000
ffaf6e2ba0 Infrared Refactor (#34142)
bugfix: Infrared beams now update instantly.
2018-01-23 01:32:28 -06:00
ShizCalev
a4b4c0c2de Fixes flash_carbon runtime (#34707) 2018-01-22 12:00:52 -06:00