shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,302 Commits 5 Branches 0 Tags
a703a599faed911367af9431fa44b91fd99cf5cd
Commit Graph

304 Commits

Author SHA1 Message Date
LetterJay
a703a599fa Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695 
[MIRROR] Makes directional windows only block air if anchored
 2017-10-16 07:08:11 -04:00
Jordan Brown
e6def19aa2 Merge pull request #31695 from ninjanomnom/directional-windows 
Makes directional windows only block air if anchored
 2017-10-15 11:33:33 -05:00
Jordan Brown
4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct 
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
 2017-10-15 11:32:05 -05:00
LetterJay
6bcec20501 Merge pull request #3396 from Citadel-Station-13/upstream-merge-31679 
[MIRROR] Adds petcollars to the cmo, captain, and bartender's locker
 2017-10-15 10:21:11 -04:00
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731 
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
 2017-10-15 10:20:04 -04:00
LetterJay
f68230c93c Update job_closets.dm 2017-10-15 06:58:52 -05:00
jughu
4b17b4a9a3 Adds petcollars to the cmo, captain, and bartender's locker 2017-10-14 18:01:05 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
vuonojenmustaturska
1831bc8ea9 Allows mobs to get shocked when they smash things (#31677) 
also fixes an unrelated runtime involving magillitis
 2017-10-14 15:19:37 -05:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
LetterJay
c28932e4d4 Update displaycase.dm 2017-10-13 22:57:31 -05:00
LetterJay
732dc95c14 Update kitchen_spike.dm 2017-10-13 22:32:32 -05:00
LetterJay
c5abf8b01f Update hivebot.dm 2017-10-13 22:32:10 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
LetterJay
f0fc11f5b5 Merge pull request #3273 from Citadel-Station-13/upstream-merge-31493 
[MIRROR] Fixes closet layer
 2017-10-10 05:55:28 -04:00
AnturK
344238a401 Fixes closet layer (#31493) 
* Fixes closet layer

* Actually this might be better.
 2017-10-10 03:20:53 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
LetterJay
a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386 
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
 2017-10-08 16:18:18 -04:00
LetterJay
bc2b6b01c1 Update target_stake.dm 2017-10-07 22:50:50 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
kevinz000
13aa6f8650 Lets cyborgs use ladders (#31378) 2017-10-07 08:40:15 -05:00
oranges
25cf971fef Merge pull request #31275 from kingofkosmos/moredeconhints 
Adds deconstruction hints to various things
 2017-10-04 16:33:51 -05:00
LetterJay
b9967e6453 Update medical.dm 2017-10-03 18:48:43 -05:00
XDTM
1782fbeed7 Adds the advanced medical scanner, gives one to the CMO 2017-10-03 18:16:29 -05:00
LetterJay
b19f88c2dc Update mineral_doors.dm 2017-10-02 17:32:42 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
2cafd6fefb Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086 
[MIRROR] Adds desc to things lacking them.
 2017-10-01 23:37:35 -04:00
LetterJay
fc89d769f0 Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130 
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
 2017-10-01 23:37:26 -04:00
LetterJay
76d6402a9d Update windoor_assembly.dm 2017-10-01 15:46:31 -05:00
LetterJay
4a4ecdf211 Update transit_tube_construction.dm 2017-10-01 15:46:20 -05:00
LetterJay
f3ae038f6c Update cargo.dm 2017-10-01 15:35:27 -05:00
LetterJay
f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605 
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
 2017-10-01 16:30:40 -04:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
Jordan Brown
3a83b28bae Adds the Cargo-Tech-of-the-Shift award 2017-10-01 09:43:20 -05:00
LetterJay
81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763 
[MIRROR] Configuration datum refactor
 2017-10-01 02:50:17 -04:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
kingofkosmos
0f387451f7 You can now examine an airlock to find out how to construct/deconstruct it (#30605) 
* Tweaks rwall construction examine-messages.

* Tweaks window construction examine-messages.

* Added airlock construction examine messages.

* Typo fix.

* Shortened the airlock electronics circuit message.

* Fixed examine text styles.

* Fixes.

* Fixed wall-examine showing on rwalls.

* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.

* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.

* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.

* Removed unnecessary rwall-examine.

* Sound full path.
 2017-10-01 00:04:14 -05:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJay
f1858a3a63 Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988 
[MIRROR] Alt-clicking descriptions when examining
 2017-09-30 12:57:52 -04:00
AnturK
3ec5a637e5 Fixes dresser being unattackable (#31123) 2017-09-30 10:30:09 -05:00
LetterJay
be08e0c29f Update mirror.dm 2017-09-29 23:42:12 -05:00
Joan Lung
e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
kingofkosmos
f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00