Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
Letter N
0805265412
yet another batch. MAJOR: APC
2020-07-30 12:54:53 +08:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Artur
3c973816d1
Ports https://github.com/tgstation/tgstation/pull/51125/
2020-05-27 12:48:25 +03:00
Artur
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
Ghom
12ac08d7c5
Porting tesla/electrocute code updates. ( #12280 )
...
* Porting tesla/electrocute code updates.
* Why is the dominator being insta-deleted by zaps a good idea?
* Yikes.
* ah
2020-05-17 16:35:17 -07:00
Artur
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
Ghommie
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
Artur
e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
Ghommie
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
Artur
f5ad854c2c
Conflict fix
2020-01-20 13:50:52 +02:00
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
Ghommie
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghommie
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
Ghommie
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
Ghommie
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
deathride58
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
oranges
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05: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
Jordan Brown
5e15a988f6
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -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
vuonojenmustaturska
32fe9d4fd6
Couple of fixes for situations involving mechas and the clock cult gamemode ( #37218 )
...
* couple of mech fixes
* safety
* gateway, gravity gen
* Restores oingo-boingo punch-nuke
2018-04-18 09:33:31 -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
deathride58
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
Jordan Brown
fd479e7128
Replaces some var values with defines
2018-02-10 11:11:09 -06:00
deathride58
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
Emmett Gaines
24b9d4b9f4
Fixes camera mobs becoming contaminated and other tweaks ( #31731 )
2017-10-14 17:40:34 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
oranges
cedb56af1b
Merge pull request #31302 from ninjanomnom/shuttle-rotation
...
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
76f7fcef9a
[MIRROR] Cleaned up paper varedits + tidied up paths ( #2156 )
...
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot
3d53f888b1
Improves several Sound Loops' Performance
2017-07-31 14:35:16 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
CitadelStationBot
01cd2039e5
Changes investigate logs to use a define
2017-05-22 22:45:54 -05:00
CitadelStationBot
778d809ff3
Fixes gravity generator admin spam
2017-05-19 13:48:39 -05:00
CitadelStationBot
db47433f40
Fixes Graviton Typo
2017-05-14 23:51:13 -05:00
LetterJay
8d237cd8bb
define var
2017-05-14 00:11:23 -05:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
LetterJay
36de555483
commit
2017-05-13 23:32:23 -05:00
CitadelStationBot
08a01aa11b
Refactors roundstart checks slightly
2017-04-26 17:06:29 -05:00
