kevinz000
d7403b3436
john doe
2020-02-19 22:26:10 -07:00
kevinz000
2dd5a0cfb8
Merge branch 'master' into hijack
2020-02-19 22:25:31 -07:00
kevinz000
fb0f12520c
Update emergency.dm
2020-02-02 16:23:54 -07:00
kevinz000
40a2698b55
Update emergency.dm
2020-01-23 19:22:00 -07:00
kevinz000
289bb590cf
changes
2020-01-23 19:20:35 -07:00
kevinz000
e7bf1738cd
ok putnom
2020-01-23 18:00:33 -07:00
Artur
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
kevinz000
c4475b1dda
variables
2020-01-22 05:39:16 -07:00
kevinz000
ccb5d32ab2
varnames
2020-01-22 05:38:09 -07:00
kevinz000
a8628cee33
udpates
2020-01-22 05:32:57 -07:00
kevinz000
9ef3879e53
fix
2020-01-22 05:17:59 -07:00
kevinz000
5b6f95cb1e
shuttle hijack
2020-01-22 05:16:33 -07: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
Ghommie
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
Ghommie
e61f13634e
Merging the end-of-shift and its shuttle call announcements into one.
2019-06-27 04:23:14 +02:00
Ghommie
af2598035a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-06-05 19:32:17 +02:00
Ghommie
0513f3464a
one
2019-06-05 19:20:25 +02:00
Ghommie
d6e54bf237
Fixes and updates pod's emergency suits storage.
2019-06-02 18:28:30 +02:00
Tupinambis
e5e97302d4
Adds a new security level: Amber ( #7976 )
...
* Adds the Amber security level.
* This isn't C
2019-02-05 17:53:58 -08: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
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
Poojawa
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
deathride58
f33d77a073
Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065
...
[MIRROR] Fixes escape pods not getting to their default destination
2018-04-10 07:47:00 +00:00
deathride58
96191b8b6a
Update emergency.dm
2018-04-10 03:15:27 -04:00
Emmett Gaines
fd8a80d6cb
Fixes escape pods not getting to their default destination
2018-04-09 05:24:55 -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
CitadelStationBot
1d6d8b454c
[MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE ( #6017 )
...
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE
* FUCK (#36483 )
F A L S E
semicolon be gone
2018-03-19 21:12:46 -05:00
Poojawa
6c7da493d9
Reee mirror bot. Hard syncs some missed PR stuff + maps ( #5951 )
...
* maps and tgui
* missed defines and helpsers
* controller things
* datums
* game folder stuff
* module things
* icons
* stragglers
* map sync and updating
wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot
9e229691cc
Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines ( #5304 )
2018-02-05 04:23:09 -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
kevinz000
47c74443da
Fixes negative auth coutns
2018-01-16 07:40:29 -06:00
deathride58
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
Emmett Gaines
8cf30a65fb
dock() re-organization
2017-12-18 21:23:58 -06: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
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
oranges
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
pubby
a01f3213f5
Traitorbro gamemode
2017-09-17 18:03:12 -05:00
CitadelStationBot
82d0aae420
[MIRROR] Changes shuttle port direction var from an angle to a dir ( #2613 )
...
* Changes shuttle port direction var from an angle to a dir
* actually ports the directions
* Update shuttle.dm
* how
2017-09-13 20:39:55 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
95f900a97d
Adds emergency toolbox to escape pod supplies ( #2182 )
2017-07-29 19:51:55 -07:00
LetterJay
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
