Commit Graph

176 Commits

Author SHA1 Message Date
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Cyprian
81fde9c7a6 Forgot to add the CE beret to the CE locker. 2019-04-06 23:34:10 +02:00
Cyprian
644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
Trilbyspaceclone
7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974)
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
2019-02-13 20:46:55 -08:00
Trilbyspaceclone
ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938)
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-02-08 05:26:42 -08: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
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
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -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
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
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
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
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
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
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04: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
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
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
MrDoomBringer
71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290)
* Arianya

* whups caps
2018-06-05 18:02:36 -05:00
81Denton
1778c97eeb Adds missing minerals to /everything closet (#38267)
* adds bs/ayy minerals to everything closet

* plastic+wood
2018-06-05 04:13:56 -05:00
MrDoomBringer
678e429dbf Adds a Supplypod-delivery admin smite (#38069)
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
2018-06-04 00:37:24 -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
CitadelStationBot
7bb6bc8dd3 [MIRROR] HoP/QM have access to vault (#6818)
* Vault Access for QM (#37880)

* HoP/QM have access to vault

* Update captain.dm
2018-05-27 17:25:18 -07:00
ShizCalev
786b062f61 Capitalizes CentCom (#38086)
* Capitalized CentCom

* neediful
2018-05-27 11:40:12 -05:00
Wilchenx
85ef262082 Removes firing-pins box in RD's locker (#37906)
Makes no sense since science can't print any guns and probably won't ever be able to again.
2018-05-21 16:36:04 -05:00
81Denton
5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890)
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
2018-05-19 02:14:00 -05:00
ShizCalev
0e819cb1fc Fixes container_resist runtimes (#37888) 2018-05-17 10:57:48 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
2018-05-14 15:13:33 -05:00
LetterJay
f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
LetterJay
c92a18f733 Update syndicate.dm 2018-05-13 22:07:01 -05:00
vuonojenmustaturska
998e49da06 Merge pull request #37809 from Qbopper/secskirts
Adds security jumpskirts this time with less broken github
2018-05-13 12:11:02 -05:00
Alexch2
b0b9240466 Fixes large crates acting like lockers (#37707)
* Fixes large crates acting like lockers

* removes forgotten comment

* Adds Cobby's suggestions, and makes the description more useful. Also improves feedback when using the wrong tool.
2018-05-12 16:41:54 -05:00
Tad Hardesty
021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
deathride58
757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680
[MIRROR] Improves skittish code
2018-05-07 12:43:47 +00:00
vuonojenmustaturska
4b36831fbe Merge pull request #37681 from kevinz000/patch-499
Fixes supply pod duping
2018-05-06 16:38:08 -05:00
vuonojenmustaturska
8e791af911 Merge pull request #37680 from kevinz000/patch-498
Improves skittish code
2018-05-06 16:37:57 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -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
4dbd06b9a2 Merge pull request #36956 from vuonojenmustaturska/anchorbin
Fixes trash bin wrenching message
2018-04-06 09:07:20 -05:00
John Ginnane
80fee95dab Fixed sometimes using items on full storage items (#36711)
* Fixed sometimes using items on full storage items

* Removed redundant code and fixed spray being used on container
2018-04-03 22:02:39 -05:00