Commit Graph

13 Commits

Author SHA1 Message Date
Trilbyspaceclone
fda9883bae Update inducer.dm 2019-05-06 14:48:16 -04:00
Trilbyspaceclone
7d310f407b Update inducer.dm 2019-05-05 06:50:22 -04:00
Trilbyspaceclone
642cad2bb2 Update inducer.dm 2019-05-05 06:40:07 -04: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
Jordan Brown
e52fafcbb7 Merge pull request #37364 from Jalleo/Inducer_change
Removes the ability for inducers and circuits to charge energy weapons.
2018-04-23 08:47:55 -05:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
oranges
4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 03:23:06 -06:00
ACCount
8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
kevinz000
82e1d1ac35 fixes inducers working from inside things (#32290) 2017-11-02 04:15:29 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
CitadelStationBot
083fc1a7b4 [MIRROR] Standardized power displays (#2539)
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00