Commit Graph

65 Commits

Author SHA1 Message Date
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
81Denton 16c05b0d92 adds warning to shuttle purchase menu (#38266) 2018-06-07 20:32:38 -05:00
vuonojenmustaturska 83cf30c92e oh ho (#38249) 2018-06-03 11:45:43 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Jordan Brown 2fb886065b Merge pull request #37928 from nichlas0010/fixescommsconsoleupdates
Comms consoles don't update while viewing messages
2018-05-20 19:38:01 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -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
Jordan Brown 554ed22603 Merge pull request #36997 from DaxDupont/is-this-real-life
Fixes dead chat announcements not using real name.
2018-04-06 09:08:48 -05:00
LetterJay 31bb211cb3 Update communications.dm 2018-04-01 19:48:15 -05:00
oranges 6e57afd034 Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle. 2018-03-31 18:27:17 -05:00
vuonojenmustaturska d44ccdb009 Merge pull request #35575 from ShizCalev/communications-console-runtime
Fixes communications console runtime
2018-02-13 10:29:47 -06:00
Leo f574bea5d1 Merge pull request #35316 from AnturK/commfix
Fixes comm message list for non-unique messages.
2018-02-05 14:37:50 -06:00
CitadelStationBot e95269398c [MIRROR] Fixes sending cross station messages during wait period. (#5311)
* Merge pull request #35286 from DaxDupont/commsfix

Fixes sending cross station messages during wait period.

* Fixes sending cross station messages during wait period.
2018-02-05 00:49:03 -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
coiax 497e6bb13f Various deadchat messages are more informative and consistent (#34326)
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
2018-01-15 02:56:10 -06:00
Tad Hardesty 149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
deathride58 e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
kevinz000 ff80771081 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason (#34157)
* Fixes dchat broadcast

* Update communications.dm
2018-01-07 18:51:16 -06:00
deathride58 e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
Dax Dupont bf3468f61c Adds more observation messages in deadchat (#34075)
* Adds more observation messages

* so bold kobold

* caching
2018-01-04 15:16:58 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay 3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay 47174097e1 Update communications.dm 2017-12-30 13:32:19 -06:00
Tad Hardesty 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Jordan Brown a834287d65 Fixes cross comms 2017-12-17 15:05:43 -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
Jordie b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
oranges 43113cd9b5 Merge pull request #31947 from AnturK/yarr
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Jordan Brown 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay f5cb95ecd6 Update communications.dm 2017-10-25 16:19:03 -05:00
LetterJay a027526ba4 Merge branch 'master' into upstream-merge-31849 2017-10-25 16:55:39 -04:00
LetterJay b7fa4410ce Update communications.dm 2017-10-22 10:46:32 -05:00
CitadelStationBot adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
oranges b439b96865 Comms console tweak 2017-10-19 03:52:52 -05:00
Jordan Brown e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -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
CitadelStationBot 94400c4d38 Allows disabling shuttle purchases per map. 2017-08-26 11:08:12 -05:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
LetterJay ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJay ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot 4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
CitadelStationBot cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot 609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot d21766956e [MIRROR] Cleaned up some emag_acts (#2018)
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
2017-07-15 13:17:56 -07:00
CitadelStationBot f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07: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