shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,218 Commits 5 Branches 0 Tags
4da91bc330c976fe0353cf949b860e87d90302b9
Commit Graph

1506 Commits

Author SHA1 Message Date
CitadelStationBot
4da91bc330 [MIRROR] Fixes Archaeology not working (#2744) 
* Fixes Archaeology not working (#30547)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* Fixes Archaeology not working
 2017-09-13 16:53:30 -05:00
LetterJay
470d15fa2b Update borer_event.dm 2017-09-13 07:13:45 -05:00
LetterJay
1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
Kyle Spier-Swenson
3da71799ab Garbage collection tweaks and refactors. (#30118) 
* Garbage collection queuing rewriting

* Some Tweaks

* Fixes some queue tracking oddities

* More tweaks

* Remove the middle two queue steps. tis was a silly idea

* New logging.

We store logging datums for use in tracking the stats of shit qdeleted

Added logging for destroy time as well as hard delete time, per type. As well as a few others

* Fix compile for testing

* Does the cyberboss

* does the antur
 2017-09-13 01:47:12 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
LetterJay
4ee17d5167 Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583 
[MIRROR] Fixes initialize hints for a fair number of mobs and items
 2017-09-12 23:31:28 -05:00
LetterJay
6c5774724d Update sound.dm 2017-09-12 23:15:48 -05:00
LetterJay
f55ad5ec95 Update safe.dm 2017-09-12 23:12:19 -05:00
LetterJay
0429a75e52 Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592 
[MIRROR] Fixed changeling augmented eyesight ability
 2017-09-12 19:10:52 -05:00
LetterJay
81fdf521fb Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502 
[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct
 2017-09-12 19:10:21 -05:00
kevinz000
ee5c44191d adds logging to graivpult precision throwing (#30608) 
* Update other_tools.dm

* Update other_tools.dm

* Update other_tools.dm
 2017-09-12 17:14:22 -05:00
LetterJay
eeadba6f18 Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494 
[MIRROR] Adds missing span-endings
 2017-09-12 06:32:45 -05:00
LetterJay
82db333ee3 Update tools.dm 2017-09-12 03:36:41 -05:00
LetterJay
3ff2263a33 Update taperecorder.dm 2017-09-12 03:22:47 -05:00
LetterJay
6413dd5264 Merge pull request #2699 from Citadel-Station-13/upstream-merge-30551 
[MIRROR] Mechs now can be connected to atmos ports
 2017-09-12 03:19:23 -05:00
LetterJay
5c228f63a5 Update dna_injector.dm 2017-09-12 03:09:19 -05:00
LetterJay
86a1901b5d Update AI_modules.dm 2017-09-12 03:08:53 -05:00
LetterJay
460820b245 Update safe.dm 2017-09-12 03:05:46 -05:00
LetterJay
59319b6bea Update taperecorder.dm 2017-09-12 03:04:56 -05:00
LetterJay
a549f3128a Update atmos_control.dm 2017-09-12 03:02:15 -05:00
LetterJay
deca859284 Update atmos_alert.dm 2017-09-12 03:00:11 -05:00
LetterJay
505925d767 Update atmos_alert.dm 2017-09-12 02:59:58 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay
01b0e754c2 Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531 
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
 2017-09-12 02:35:17 -05:00
LetterJay
caca1d1794 Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553 
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
 2017-09-12 01:22:11 -05:00
LetterJay
a5a8f8faba Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530 
[MIRROR] Adds Gondoland and the rare Gondolas
 2017-09-12 01:21:09 -05:00
LetterJay
7deeac86eb Merge pull request #2670 from Citadel-Station-13/upstream-merge-29839 
[MIRROR] [s] Adds a security token to all admin hrefs
 2017-09-12 01:17:56 -05:00
LetterJay
f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
LetterJay
0431fa3cb6 Merge branch 'master' into upstream-merge-30544 2017-09-11 23:21:00 -05:00
LetterJay
1d19ee6bbf Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117 
[MIRROR] Crew monitoring rework part 1: crew pinpointers
 2017-09-11 22:41:24 -05:00
Joan Lung
2dc3868949 Makes shiny versions of lavaland monsters slightly more distinct (#30502) 
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
 2017-09-11 20:54:55 -05:00
LetterJay
ce518ee45e Update closets.dm 2017-09-11 18:56:10 -05:00
LetterJay
e2f9ec4f18 Merge pull request #2686 from Citadel-Station-13/upstream-merge-30538 
[MIRROR] Uplink lock codes now pick from the phonetic alphabet global list
 2017-09-11 18:54:53 -05:00
LetterJay
bf5094cf19 Update nuclearbomb.dm 2017-09-11 18:40:30 -05:00
msgerbs
d9abc21a9a Fixed changeling augmented eyesight ability (#30592) 
* Fix changeling augmented eyesight

Fix not being able to toggle changeling augmented eyesight off again.

* Fix augmented eyesight

Fix changeling's augmented eyesight ability.

* Fix changeling augmented vision

Fix changeling augmented vision, for real this time. Makes it properly grant night vision on purchase, remove granted effects on refund, and properly toggle on and off. Note, this changes it to x-ray vision, to replicate the way it has been working for well over a year.
 2017-09-11 18:38:16 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJay
e6cc0673aa Merge branch 'master' into upstream-merge-30399 2017-09-11 18:07:15 -05:00
LetterJay
6cc0ea6af0 Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412 
[MIRROR] Regularizes resisting out of containers
 2017-09-11 18:05:52 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
LetterJay
914cc38a2d Merge pull request #2676 from Citadel-Station-13/upstream-merge-30515 
[MIRROR] Added warnings for ultrasafe and safe security modes
 2017-09-11 17:54:18 -05:00
LetterJay
b5c007ffdf Update vending.dm 2017-09-11 17:50:56 -05:00
LetterJay
74588305ce Update vending_items.dm 2017-09-11 17:50:49 -05:00
LetterJay
c42304737a Update implantchair.dm 2017-09-11 17:47:55 -05:00
LetterJay
ea82bf9bfa Update suit_storage_unit.dm 2017-09-11 17:47:48 -05:00
KorPhaeron
4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJay
240c5bdaad Update game_mode.dm 2017-09-11 15:55:27 -05:00
LetterJay
59772e2afd Update events.dm 2017-09-11 15:54:55 -05:00