Commit Graph

346 Commits

Author SHA1 Message Date
Poojawa 7d300117af literally everything Bhjin has been complaining about
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
Poojawa b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
deathride58 1e4bcc7af3 Merge pull request #7493 from Citadel-Station-13/kevinz000-patch-2
*FIXES* comms consoles not working after autocall - yes this is a bug
2018-08-26 21:23:23 -04:00
deathride58 bcb6a495b0 Merge pull request #7490 from Citadel-Station-13/kevinz000-patch-5
allows emagged shuttle purchase requirement but this time it merges into master instead of a broken branch
2018-08-26 21:22:49 -04:00
kevinz000 c1b3f7afee Update communications.dm 2018-08-23 22:46:59 -07:00
LetterJay 1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
kevinz000 0f19e35b6a Update communications.dm 2018-08-23 00:32:49 -07:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
vuonojenmustaturska 417496aa6e Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects (#38934)
* Wrap setting anchored for structures, fix atmos bug

* forgot this

* Add a signal for setanchored

* move setanchored to obj

* machinery, also some structure stuff

* tabbing
2018-07-06 13:28:01 -05:00
deathride58 b2ec8f89e0 missed files 2018-07-05 01:27:07 -04:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
ShizCalev 452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
LetterJay 8f7ca9fbba Merge pull request #7211 from Citadel-Station-13/upstream-merge-38534
[MIRROR] Fixes AI's being unable to call shuttle using comm console.
2018-06-24 15:16:09 -05:00
CitadelStationBot 386bc528ea [MIRROR] Add logging to teleport and the teleporter destination setting (#7225)
* Add logging to teleport and the teleporter destination setting (#38645)

Helps with some admin issues

* Add logging to teleport and the teleporter destination setting
2018-06-22 00:34:41 -07:00
AnturK 5e156e7a07 Fixes AI's being unable to call shuttle using comm console. (#38534)
* Fixes AI's being unable to call shuttle using comm console.

* Lets get rid of double negatives

* viewvers for
2018-06-20 19:39:17 -05:00
CitadelStationBot 03a22ca16d [MIRROR] Transit space refactor (#7130)
* Transit space refactor

* Update bitfields.dm
2018-06-18 11:51:02 -07:00
Jordan Brown c25971d569 Merge pull request #38493 from ShizCalev/typo-fix
Corrects typos
2018-06-16 06:19:20 -05:00
oranges 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-11 22:29:27 -05:00
CitadelStationBot 2a727c6df2 [MIRROR] Removes unused overview code. (#7054)
* Merge pull request #38361 from AnturK/yeahno

Removes unused overview code.

* Removes unused overview code.
2018-06-10 12:31:19 -07:00
CitadelStationBot 6510066918 [MIRROR] Logs minor and major crimes (#7053)
* Merge pull request #38358 from nfreader/record_crimes

Logs minor and major crimes

* Logs minor and major crimes
2018-06-10 12:29:15 -07: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
deathride58 38878094bc Merge pull request #6982 from Citadel-Station-13/upstream-merge-38264
[MIRROR] Fix autoprocessing cloners
2018-06-09 05:13:23 +00:00
deathride58 5858b790d7 Update cloning.dm 2018-06-09 00:34:01 -04:00
81Denton 16c05b0d92 adds warning to shuttle purchase menu (#38266) 2018-06-07 20:32:38 -05:00
deathride58 b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
deathride58 cff10c62d0 Update cloning.dm 2018-06-05 17:24:15 -04:00
81Denton 2fb5bb10b5 Arcade reward: snack rigs (#38268)
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
2018-06-05 13:27:39 -05:00
LetterJay b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223
[MIRROR] Slight changes to camera network code
2018-06-05 12:11:19 -05:00
vuonojenmustaturska 83cf30c92e oh ho (#38249) 2018-06-03 11:45:43 -05:00
Jalleo d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
Tad Hardesty 5173ac3211 Fix autoprocessing cloners 2018-06-03 09:02:20 -05:00
LetterJay 5646dd794b Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180
[MIRROR] Fix family heirloom being lost on cloning
2018-06-02 07:29:17 -05:00
Jordan Brown 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Jordan Brown f2124aa3cf Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone
Fix family heirloom being lost on cloning
2018-06-01 09:51:08 -05:00
Cruix 9c4f4ce17f AI Multicamera mode (#37695)
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -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
Jordan Brown d9b07c1f5d Merge pull request #38045 from ShizCalev/id-teleport-fix
Security console fixes
2018-05-25 11:01:10 -05:00
ShizCalev bb2f79ed7b Fixes gulag teleporter runtime (#37962) 2018-05-23 01:41:24 -05:00
LetterJay 32cf8e6eb2 Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928
[MIRROR] Comms consoles don't update while viewing messages
2018-05-21 08:30:19 -05:00
Nich 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -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
LetterJay 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
XDTM 5847268db3 Linked teleporters now teleport to the hub instead of the power station (#37684) 2018-05-13 06:13:27 -05:00
deathride58 aabd098e2e Merge pull request #6695 from Citadel-Station-13/upstream-merge-37709
[MIRROR] Adds emag_act feedback msg to battle arcade machine
2018-05-11 03:40:41 +00:00
Denton c34cf3d67f Hit it! They call me Cuban Pete I'm the king of the Rumba beat When I play the maracas I go Chic-chic-ky-boom Chic-chic-ky-boom Yes sir, I'm Cuban Pete I'm the craze of my native street When I start to dance everything goes Chic-chic-ky-boom Chic-chic-ky-boom The senioritas they sing And they swing with "terampero" It's very nice! So full of spice! And when they dance in they bring A happy ring that "era keros" Are singing a song All the day long So if you like the beat Take a lesson from Cuban Pete And I'll teach you to Chic-chic-ky-boom Chic-chic-ky-boom Chic-chic-ky-boom He's a really modest guy Although he's the hottest guy In Havana, in Havana Si, senorita I know That you would like a Chic-ky-boom-chick It's very nice - so full of spice I'll place my hand on your hip And if you will just give me your hand Then we shall try Just you and I "Iy-yi-yi!" "Shake your booty, daddy, wow! See ya'!" 2018-05-09 16:19:33 -05:00