shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,865 Commits 5 Branches 0 Tags
2d3969882a9db26b3cea9080036f047382e95265
Commit Graph

605 Commits

Author SHA1 Message Date
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
deathride58
bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116 
[MIRROR] Refactor machinery to default to being anchored
 2018-06-05 23:37:20 +00:00
deathride58
cf170aee33 Merge pull request #7019 from Citadel-Station-13/upstream-merge-38193 
[MIRROR] Turns /datum.isprocessing into a datum flag
 2018-06-05 23:36:37 +00:00
MrDoomBringer
71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -05:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00: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
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
ShizCalev
4452dc4629 Corrects bronze floor & table's name (#38164) 2018-05-31 22:41:01 -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
LetterJay
761035b391 Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960 
[MIRROR] Fix some inconsistencies relating to resting
 2018-05-27 14:39:18 -05:00
ShizCalev
786b062f61 Capitalizes CentCom (#38086) 
* Capitalized CentCom

* neediful
 2018-05-27 11:40:12 -05:00
Jordan Brown
f9cb1e34c6 Merge pull request #38044 from Mickyan/bronzegirder_spelfix 
Fixes bronze spelling in girder construction
 2018-05-25 11:01:18 -05:00
Jordan Brown
2bcfe00283 Fix some inconsistencies relating to resting 2018-05-25 10:56:47 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -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
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -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
LetterJay
ca86c93e70 Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406 
[MIRROR] Adds (fake) ambient occlusion as a client preference
 2018-05-13 11:52:23 -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
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
deathride58
8bc97a10d6 Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676 
[MIRROR] Prevents electric grills from mass producing lightning through exploits
 2018-05-07 12:44:12 +00: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
vuonojenmustaturska
ed41503127 Merge pull request #37676 from AverageJoe82/electric-grill-engine 
Prevents electric grills from mass producing lightning through exploits
 2018-05-06 16:37:49 -05:00