Artur
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
Artur
43951bf44e
Ports https://github.com/tgstation/tgstation/pull/51152
2020-06-17 17:01:55 +03:00
Putnam
e8d7da56f4
Ported C++mos from yogs (help me)
2020-05-11 15:44:26 -07:00
Artur
f97f264fb7
Fixing more stuff
...
Mint machine compile fixes and the syndicate contractor program.
2020-04-23 20:09:42 +03:00
Artur
120615d472
Ports https://github.com/tgstation/tgstation/pull/44525 , and
...
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
Artur
a8aa2e2014
Updates modular computers, begins work on shuttle stuff.
2020-04-23 15:06:35 +03:00
Artur
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
Kraseo
dff0e03f11
fixes null runtime and baton inhands
2020-03-08 00:27:16 +01:00
Kraseo
edfe50579e
ACTUALLY fixes null runtimes + double contracts
2020-03-04 13:17:24 +01:00
Kraseo
648f7793d3
proving to the world i'm retarded one commit line at a time
2020-03-01 23:56:34 +01:00
Seris02
26e16d7c89
yeet
2020-02-06 07:49:19 +08:00
Seris02
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
kevinz000
2393dc26eb
Merge pull request #10779 from Ghommie/Ghommie-cit538
...
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
Ghommie
0dba1b5102
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-01-30 02:17:02 +01:00
Artur
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
Seris02
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed
hijack implant
2020-01-18 18:04:31 +08:00
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
Ghommie
63da5ffb13
ID console fixes and other tweaks.
2019-11-11 17:10:14 +01:00
deathride58
68813b6846
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
2019-10-22 19:14:12 -04:00
deathride58
905f32b193
further optimizes performance by making all of the meta gas properties use their own individual lists instead of being in a messy nested list
2019-04-14 16:40:37 -04:00
deathride58
8b75240d89
fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive
2019-04-11 17:07:11 -04:00
deathride58
c8d51c4231
Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time
2019-04-02 01:11:29 -04:00
Poojawa
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
deathride58
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -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
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
Poojawa
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
Jordan Brown
bc2f2a9728
[READY]Randomized Station Time + Night Shifts
2018-02-21 12:02: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
Tad Hardesty
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
oranges
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
LetterJay
228aed8b35
Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546
...
[MIRROR] Refactor of base machinery a tiny bit more. DONE
2017-11-13 11:44:46 -06:00
Jalleo
300c471da9
Refactor of base machinery a tiny bit more. DONE ( #32546 )
...
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.
* Just checking something
* Does this fix the compiling not working properly?
* And this?
* What is going wrong ugh!
* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?
* Slight tidying up for what Cyberboss and Antur likes.
* Fixes the things that I was asked to fix
2017-11-12 13:19:23 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
Tad Hardesty
6581eb8526
Hide already-downloaded programs from NTNet downloader ( #32396 )
2017-11-04 18:02:13 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
nicbn
078128aa91
Paper markdown ( #30873 )
...
* why it doesn't work
* list thing
* oops
* fixes list. maybe
* Less regex
* wip
* Done I think. I think
* return your functions
* Replace $10 by $a
2017-09-30 08:11:01 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
CitadelStationBot
b08ec542e7
[MIRROR] Minor tweaks to an if ( #2839 )
...
* Minor tweaks to an if (#30683 )
* Minor tweaks to an if
* Whoops
* Minor tweaks to an if
2017-09-17 22:16:31 -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
LetterJay
63c94a5c2b
Merge branch 'master' into upstream-merge-30633
2017-09-13 08:00:06 -05:00
LetterJay
05efdd9ad3
Update sm_monitor.dm
2017-09-11 15:45:34 -05:00
Jordan Brown
799ae80b8a
Missed some parentheses in multi Z
2017-09-11 15:43:50 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
ShizCalev
4282d82e33
Allows atmos techs to download the SM monitor ( #30458 )
2017-09-06 21:00:25 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
