spookydonut
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
Ghom
d5a6c25128
Update tablet.dm
2020-03-11 13:19:57 +01:00
Ghommie
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
Kraseo
ad20fb1a0e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
kappa-sama
ec3e2ddb24
no more laptop slowdown
2020-03-01 21:17:48 -05:00
Kraseo
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
Kraseo
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
Kraseo
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Seris02
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
Ghommie
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01: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
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Arturlang
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
Ghommie
0dba1b5102
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-01-30 02:17:02 +01:00
Seris02
e45cc4933c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-27 08:33:38 +08:00
kevinz000
a5404f6063
Merge pull request #10687 from Ghommie/Ghommie-cit523
...
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
Artur
e360ac1d36
Conflict fix
2020-01-24 23:06:32 +01:00
Ghommie
721fd108f9
A few more, ported, runtime fixes.
2020-01-24 03:02:07 +01:00
Arturlang
0a545da35d
Webedit galore
2020-01-22 18:12:26 +01:00
Arturlang
e025c8a743
Oh right its a typo
2020-01-22 18:11:37 +01:00
Seris02
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
Artur
f5ad854c2c
Conflict fix
2020-01-20 13:50:52 +02:00
Seris02
fdf3871cb7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-18 18:30:51 +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
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
Ghommie
63da5ffb13
ID console fixes and other tweaks.
2019-11-11 17:10:14 +01:00
Ghommie
dcc81d92b5
Fixing a few throw_at calls and modular computer processors Init.
2019-11-04 00:12:41 +01:00
Ghommie
ffecca8c11
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-03 03:24:28 +02:00
Ghommie
55795355fd
Ports "[s] Fixes pride mirror exploit"
2019-06-19 03:31:36 +02:00
Ghommie
0513f3464a
one
2019-06-05 19:20:25 +02: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
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
Jordan Brown
5e15a988f6
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -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
06b7cdf27a
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
deathride58
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
vuonojenmustaturska
f373b2c9e6
Kills off three more flags from flags_2
2018-04-29 17:30:55 -05:00
oranges
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
81Denton
b368ab377b
fixes obj descs and adds new ones ( #37483 )
2018-04-27 13:21:08 -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
LetterJay
610a001ad5
Update computer_ui.dm
2018-04-01 04:37:57 -05:00
vuonojenmustaturska
b53373dec0
Fixes modular computer ui_interact runtime
2018-03-28 12:15:58 -05:00
Jordan Brown
bc2f2a9728
[READY]Randomized Station Time + Night Shifts
2018-02-21 12:02:28 -06:00
Jordan Brown
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
