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

2452 Commits

Author SHA1 Message Date
LetterJay
77db385078 Merge pull request #3026 from Citadel-Station-13/upstream-merge-31158 
[MIRROR] [s] Fixes config reading exploit
 2017-09-30 12:56:04 -04:00
LetterJay
99712e76e9 Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873 
[MIRROR] Paper markdown
 2017-09-30 12:55:53 -04:00
LetterJay
6969777c06 Merge pull request #3020 from Citadel-Station-13/upstream-merge-31113 
[MIRROR] Strip propriety macros from tooltips
 2017-09-30 12:55:36 -04:00
Jordan Brown
3b64e0ec35 [s] Fixes config reading exploit 2017-09-30 09:45:13 -05:00
nicbn
078128aa91 Paper markdown (#30873) 
* why it doesn't work

* list thing

* oops

* fixes list. maybe

* Less regex

* wip

* Done I think. I think

* return your functions

* Replace $10 by $a
 2017-09-30 08:11:01 -05:00
Tad Hardesty
20e7f03910 Strip propriety macros from tooltips (#31113) 2017-09-30 08:03:28 -05:00
oranges
384332fe20 Small refactor to movement (#31071) 
You can now move an object into nullspace, which will call exited on
it's parent and parent area but will not call any entered.

Note that you cannot pass null into forceMove it will crash, instead use
the new proc that will call the underlying logic with a null destination

Some of the force move procs have been refactored to check that their
parent move succeeded before doing updates
 2017-09-30 07:23:35 -05:00
LetterJay
e63f93979f Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572 
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
 2017-09-30 02:41:38 -04:00
LetterJay
eb05246c8b Update giant_spider.dm 2017-09-29 23:33:54 -05:00
LetterJay
2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns 
Wave 3 of guns
 2017-09-29 12:45:52 -04:00
LetterJay
7263926251 Merge pull request #2961 from Citadel-Station-13/upstream-merge-31038 
[MIRROR] DisplayTimeText for setup time on login
 2017-09-29 12:18:25 -04:00
LetterJay
ee0d1f15f8 Merge pull request #3001 from Citadel-Station-13/upstream-merge-31064 
[MIRROR] Silver slime extracts create proper fried foods
 2017-09-29 01:46:40 -04:00
LetterJay
c2f6c7dbf8 Merge pull request #2998 from Citadel-Station-13/upstream-merge-31063 
[MIRROR] Profile access is granted when holder is created
 2017-09-29 01:46:05 -04:00
LetterJay
e4e741d924 Merge pull request #2997 from Citadel-Station-13/upstream-merge-31074 
[MIRROR] Ninja outfit code cleanup
 2017-09-29 01:45:54 -04:00
LetterJay
d535514909 Merge pull request #2994 from Citadel-Station-13/upstream-merge-31061 
[MIRROR] Fixes MMI buckled-warning
 2017-09-29 01:45:08 -04:00
LetterJay
75359598b3 Merge pull request #2988 from Citadel-Station-13/upstream-merge-31060 
[MIRROR] Fixes larva evolving while restrained
 2017-09-29 01:43:07 -04:00
LetterJay
80e92ebdc5 Merge pull request #2987 from Citadel-Station-13/upstream-merge-30858 
[MIRROR] [READY]Refactors timestops to use fields
 2017-09-29 01:42:56 -04:00
LetterJay
cef4ae4fd6 Merge pull request #2975 from Citadel-Station-13/upstream-merge-30661 
[MIRROR] Advanced camera consoles use a list for z lock rather than a single z level
 2017-09-29 01:41:32 -04:00
ShizCalev
9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110) 
* Stops revheads metagaming

* Added comment.
 2017-09-28 22:00:16 -05:00
oranges
baf72b8412 Merge pull request #31064 from YPOQ/silverfriedfoods 
Silver slime extracts create proper fried foods
 2017-09-28 21:55:42 -05:00
Jordan Brown
eb27276765 Profile access is granted when holder is created 2017-09-28 21:53:12 -05:00
oranges
a01540e39b Merge pull request #31074 from pubby/ninjaoutfit 
Ninja outfit code cleanup
 2017-09-28 21:53:05 -05:00
kingofkosmos
977163ae54 Fixes MMI buckled-warning (#31061) 
* Fixes MMI having a buckled-warning when trying to move.

* Comment added.
 2017-09-28 21:48:35 -05:00
YPOQ
a780d6f79e Fixes larva evolving while restrained (#31060) 2017-09-28 21:46:43 -05:00
kevinz000
724fa8ce54 [READY]Refactors timestops to use fields (#30858) 
* kek

* fixes

* Fixes

* fixes

* throw freeze

* woops

* double woops
 2017-09-28 21:46:34 -05:00
XDTM
9b5a2f7490 Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow 2017-09-28 16:02:31 -05:00
LetterJay
3e27458d11 Merge pull request #2968 from Augustfox/master 
Organize hair and facial hair in character creation
 2017-09-28 12:29:10 -04:00
LetterJay
4e19b5a5f8 Merge pull request #2969 from Citadel-Station-13/upstream-merge-31041 
[MIRROR] Removes some spawns
 2017-09-28 12:25:33 -04:00
LetterJay
e6356d2560 Merge pull request #2955 from Citadel-Station-13/upstream-merge-31020 
[MIRROR] Variants will not be spawned by gold cores
 2017-09-28 12:22:44 -04:00
LetterJay
b2682b401c Merge pull request #2963 from Citadel-Station-13/upstream-merge-31035 
[MIRROR] Makes the mining vendor give more verbose feedback
 2017-09-28 12:22:10 -04:00
KorPhaeron
6fca708b33 Advanced camera consoles use a list for z lock rather than a single z level (#30661) 
* Refactor Abductor Console

* Station lock
 2017-09-28 10:44:12 -05:00
Jordan Brown
97b8a6ed3b Removes some spawns 2017-09-28 10:43:07 -05:00
CitadelStationBot
2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967) 
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
 2017-09-28 05:59:57 -07:00
CitadelStationBot
4f281e5ea1 [MIRROR] Blackbox stat for internet midis (#2964) 
* Blackbox stat for internet midis

* Blackbox stat for internet midis
 2017-09-28 05:56:26 -07:00
Augustfox
612707c999 Alphabetize hair and facial hair in char creation 
🆑
Reordered hair in a semi-alphabetized list for easier use in character creation.
Alphabetized facial hair for easier use in character creation.
/🆑
No names or content changed other then order in list.
 2017-09-27 23:45:15 -05:00
LetterJay
7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888 
[MIRROR] Refactors cinematics.
 2017-09-27 23:42:35 -04: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
ShizCalev
9b2f07335a Makes the mining vendor give more verbose feedback 2017-09-27 15:45:19 -05:00
ShizCalev
fa92394e4e DisplayTimeText for round time on login 2017-09-27 15:45:05 -05:00
LetterJay
18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893 
[MIRROR] Datum abductors refactor
 2017-09-27 16:31:53 -04:00
LetterJay
000ce51c9a Merge pull request #2927 from Citadel-Station-13/upstream-merge-30958 
[MIRROR] Makes a flags var use NONE instead of 0
 2017-09-27 16:31:38 -04:00
LetterJay
a099fb627c Merge pull request #2918 from Citadel-Station-13/upstream-merge-30953 
[MIRROR] Suiciding with a gun blows your brain out
 2017-09-27 16:31:25 -04:00
LetterJay
2e133c0b2c Update ears.dm 2017-09-27 15:12:22 -05:00
LetterJay
2163132c52 Update ballistic.dm 2017-09-27 15:10:59 -05:00
Michiyamenotehifunana
59541efffb Wave 3 of guns 
Reskinnable stetchkins, magrifle, flechette gun, Hyper-burst rifle, and 10mm soporific bullets.
 2017-09-27 23:08:36 +08:00
Armhulen
0aea66649e whoops we'll get right on that (#31020) 2017-09-27 00:45:49 -05:00
vuonojenmustaturska
10bf80139c Fixes MMI to AI law transfer (#31017) 
* Fixes MMI to AI law transfer

* Fixes issue with preloaded laws on AI core
 2017-09-26 16:52:17 -05:00
LetterJay
b51e4457f5 Merge pull request #2949 from Citadel-Station-13/upstream-merge-31009 
[MIRROR] Fixes alium leap exploit
 2017-09-26 15:07:06 -04:00
LetterJay
ec3fc4441c Update cinematic.dm 2017-09-26 14:02:49 -05:00
LetterJay
dab03b249d Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992 
[MIRROR] Spiderpalooza 1: Foods!
 2017-09-26 15:01:02 -04:00