shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,260 Commits 5 Branches 0 Tags
40f5d7d4bf2dd67debcb01a03aa5296425cea463
Commit Graph

806 Commits

Author SHA1 Message Date
CitadelStationBot
1051fb4fa7 [MIRROR] Corrects runtime in observer.dm (#2610) 
* Corrects runtime in observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm
 2017-09-13 22:55:22 -05:00
CitadelStationBot
099b6628fa [MIRROR] Full jobs will no longer be shown as priority for latejoiners (#2729) 
* Full jobs will no longer be shown as priority for latejoiners

* Update card.dm
 2017-09-13 22:54:41 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
CitadelStationBot
9031a1b671 [MIRROR] Soft crit slowdown for all carbons (#2743) 
* Soft crit slowdown for all carbons

* Update carbon_movement.dm

* Update carbon_movement.dm

* Update species.dm

* actually pay attention to spacings
 2017-09-13 21:29:50 -05:00
CitadelStationBot
067e03726f [MIRROR] Renames the mob spawner menu (#2620) 
* Renames the mob spawner menu

* Actually mirrors
 2017-09-13 20:42:40 -05:00
CitadelStationBot
26320a7047 [MIRROR] Fixes stands not dying with their user (#2615) 
* Fixes stands not dying with their user

* actually mirrors
 2017-09-13 20:26:52 -05:00
CitadelStationBot
e1d2d3d36d [MIRROR] Adds "large bun" hairstyle (#2609) 
* Adds "large bun" hairstyle

* bun hair hair'd
 2017-09-13 18:34:40 -05:00
CitadelStationBot
1c06a2b277 [MIRROR] Fixes goliath tentacles (#2738) 
* Merge pull request #30646 from ChangelingRain/tentafix

Fixes goliath tentacles

* Fixes goliath tentacles
 2017-09-13 16:53:52 -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
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
c924ec765a Update ed209bot.dm 2017-09-12 23:19:05 -05:00
LetterJay
e88bb9c612 Update shadowpeople.dm 2017-09-12 23:15:53 -05:00
LetterJay
912746d8a4 Merge pull request #2700 from Citadel-Station-13/upstream-merge-30584 
[MIRROR] Fixes ventriloquist dummy
 2017-09-12 19:11:09 -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
LetterJay
6b27a81e61 Update powers.dm 2017-09-12 03:10:07 -05:00
LetterJay
fcfd4a2ce1 Update ed209bot.dm 2017-09-12 03:06:43 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -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
fcbebe6423 Update life.dm 2017-09-12 01:03:11 -05:00
LetterJay
2ae18cd35e Update life.dm 2017-09-12 00:52:07 -05:00
LetterJay
d045103744 Update life.dm 2017-09-12 00:48:22 -05:00
LetterJay
f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
LetterJay
6c9609a7ee Merge branch 'master' into upstream-merge-30580 2017-09-11 23:19:07 -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
Poojawa
2629d3b87d Adds horse, cow tails, Sergal ears/tails also (#2695) 
* Adds horse, sergal, cow tails

* Slight tweaks before bed

* sprite tweaks
 2017-09-11 20:22:21 -05:00
LetterJay
beed20c130 Update life.dm 2017-09-11 18:52:14 -05:00
LetterJay
5c9ba3593a Merge pull request #2678 from Citadel-Station-13/upstream-merge-30482 
[MIRROR] People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit
 2017-09-11 18:45:22 -05:00
LetterJay
5c42666355 Merge pull request #2707 from Citadel-Station-13/upstream-merge-30590 
[MIRROR] Fixes Punpun (again)
 2017-09-11 18:45:06 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
LetterJay
bfe633540a Update human_movement.dm 2017-09-11 17:55:35 -05:00
LetterJay
6816b83a6d Merge pull request #2673 from Citadel-Station-13/upstream-merge-30509 
[MIRROR] num2text the Instances number
 2017-09-11 17:53:54 -05:00
KorPhaeron
4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJay
01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
AnturK
1553e26fe2 I missed that in last fix. (#30590) 2017-09-11 14:37:22 -05:00
LetterJay
c1872907b1 Update robot_modules.dm 2017-09-11 13:10:18 -05:00
LetterJay
ff17626ce7 Update death.dm 2017-09-11 13:09:30 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
AnturK
19adbb9a32 Fixes ventriloquist dummy (#30584) 2017-09-11 12:32:49 -05:00
vuonojenmustaturska
053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
LetterJay
0a30d7e962 Merge pull request #2646 from Citadel-Station-13/upstream-merge-30466 
[MIRROR] Fixes drone light toggle while dead
 2017-09-10 15:23:45 -05:00
KorPhaeron
134c3f5f39 Losebreath 2017-09-10 12:37:29 -05:00