Commit Graph

641 Commits

Author SHA1 Message Date
nik707 cae30f90ad Merge pull request #7799 from R3dtail/new_carpet
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
2018-12-10 16:45:38 -06:00
Redtail 4c7075f1a8 New medals added.
add:  Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06:00
Redtail 629189fdc1 Added Another new carpet, and two tables, and a new cargo crate.
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
nik707 fd2e9ad5c0 Merge pull request #7753 from Trilbyspaceclone/Trilbyspaceclonepatch-6
Makes skeletal no longer KPA proof, but Pirate skeletal are still do to being Free or something
2018-11-23 15:12:19 -06:00
Trilbyspaceclone f3f314ea6e Yarr 2018-11-20 20:05:31 -05:00
deathride58 402a5ba9e4 Makes it plausible to join as ghost roles from the latejoin menu (#7726)
* Makes it plausible to join as ghost roles from the latejoin menu

* Clarifies a little bit of the text
2018-11-16 14:47:42 -08:00
deathride58 1d198a6ea1 Merge pull request #7652 from Michiyamenotehifunana/ToriCrate
Resprites all regular crates to 3/4ths ones
2018-10-14 04:45:01 -04:00
Michiyamenotehifunana f40011a0ce Resprites all basic crates 2018-10-13 17:43:21 +08:00
Poojawa a29e30a543 fixes runtimes 2018-10-12 05:55:50 -05:00
deathride58 0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa cb342866d6 a few last minute changes from TG
also changes His Grace from 25 to 10 requirments
2018-09-18 23:12:29 -05:00
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 bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa 1a2460ed28 Continous update intergration until being merged
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
Poojawa 22e2990ee7 //USE THIS TO FILL IT, NOT INITIALIZE OR NEW 2018-09-14 07:47:13 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
Poojawa 2066111026 Fixes an <i> noticed in Musician.dm (#7548) 2018-09-07 05:43:00 -07:00
deathride58 b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
Tupinambis afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
LetterJay 1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
deathride58 c88ceccfe0 Merge pull request #7462 from Citadel-Station-13/kevinz000-patch-5
fixes telekenetic snatching from toilets where some captains hide the spare id
2018-08-17 16:50:18 -04:00
kevinz000 15f1d48311 Update watercloset.dm 2018-08-14 22:01:38 -07:00
kevinz000 6166d15d40 Update bedsheet_bin.dm 2018-08-14 21:57:49 -07:00
kevinz000 f50b370fd1 Update bedsheet_bin.dm 2018-08-14 21:56:44 -07:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 6670284b62 fixes items spawning on top of closets rather than inside closets (#7361) 2018-07-20 03:41:34 -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 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot 06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327)
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
2018-07-04 18:38:53 -07:00
Letter N abc32ed0df adds "cap's female formal outfit" (#7307)
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
2018-07-04 05:37:01 -07:00
CitadelStationBot 0500be9b35 [MIRROR] Fixes some shard harddel stuff. (#7299)
* Fixes some shard harddel stuff. (#38799)

* Fixes some shard harddel stuff.
2018-07-02 06:44:50 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
TerraGS 2d3969882a Updates plastic flaps icon and cleans up its code (#38751)
cl
imageadd: New icon for plastic flaps that actually looks airtight.
code: Update to plastic flaps code to use tool procs rather than attackby and removed two pointless states.
/cl

Gives plastic flaps an airtight look to fit their new property. Removes two defines that were just a functional copy of anchored. Replaces calls to attackby() with screwdriver_act() and wirecutter_act().
2018-07-01 05:43:01 -05:00
Jordan Brown 2cd16aa1ad Fix some shuttle chair stuff (#38557)
* Fix shuttle chair stuff

* Remove redundancy
2018-06-19 01:29:17 -05:00
LetterJay 7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539
[MIRROR] Adds New Shuttle Chairs
2018-06-18 21:58:42 -05:00
LetterJay 81b88d0d85 Merge pull request #7166 from Citadel-Station-13/upstream-merge-38543
[MIRROR] Fix non-secure windoors not supporting One Required access mode
2018-06-18 12:30:26 -05:00
LetterJay fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270
[MIRROR] [READY] advanced foam extinguisers [READY]
2018-06-18 12:28:42 -05:00
LetterJay aa0e383a2c Merge pull request #7125 from Citadel-Station-13/upstream-merge-38490
[MIRROR] Fixes missing creampies
2018-06-18 09:50:56 -05:00
Tad Hardesty 896942dcf1 Fix non-secure windoors not supporting One Required access mode (#38543) 2018-06-18 09:39:00 -05:00
fludd12 96b620d540 Adds New Shuttle Chairs (#38539)
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
2018-06-18 09:38:25 -05:00
Tlaltecuhtli 1a42719d80 Advanced foam extinguisers (#38270)
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
2018-06-18 09:38:07 -05:00
Dax Dupont bde58b5442 Fixes missing creampies (#38490) 2018-06-16 06:19:45 -05:00
Tad Hardesty a7b900425b [s] Prevent unbreakable ladders from being moved by shuttles (#38477)
* Prevent unbreakable ladders from being moved by shuttles

* Disconnect ladders before and reconnect them after shuttle move
2018-06-16 06:18:08 -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 e68fbe9fa4 [MIRROR] Readds actual fun to admins throwing around drop pods (#7052)
* Readds actual fun to admins throwing around drop pods (#38374)

* Readds fun

* Fun

* Readds actual fun to admins throwing around drop pods
2018-06-10 12:28:38 -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