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

2473 Commits

Author SHA1 Message Date
vuonojenmustaturska
e8a1ceffcb Speeds up simple_animals/hostile/proc/CanAttack() 2017-09-30 19:48:59 -05:00
LetterJay
063a44281e Merge branch 'master' into upstream-merge-31044 2017-09-30 14:53:08 -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
LetterJay
10b530920b Merge pull request #3015 from Citadel-Station-13/upstream-merge-31111 
[MIRROR] Fixes SM shard extraction
 2017-09-30 12:57:33 -04:00
LetterJay
2847d71e07 Merge pull request #3013 from Citadel-Station-13/upstream-merge-31089 
[MIRROR] Fixes PA Href Issue
 2017-09-30 12:57:21 -04:00
LetterJay
d45a29eca2 Merge pull request #3012 from Citadel-Station-13/upstream-merge-31099 
[MIRROR] Fixes evidence bag not respecting inventory
 2017-09-30 12:57:10 -04:00
LetterJay
02e4ce7cf5 Merge pull request #3011 from Citadel-Station-13/upstream-merge-31087 
[MIRROR] Removes a call to datum/New()
 2017-09-30 12:57:00 -04:00
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
dc2140a88d Update paper.dm 2017-09-30 02:15:40 -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
ShizCalev
c54ea1b9bf Fixes SM shard extraction (#31111) 
* Fixes SM shard extraction

* Space-OSHA called. They want to have a word.
 2017-09-29 18:43:41 -05:00
Jordan Brown
cd334646c3 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
AnturK
c37f74035e Fixes evidence bag not respecting inventory 2017-09-29 16:00:30 -05:00
Jordan Brown
77c2c77f0e Removes a call to datum/New() 2017-09-29 15:59:19 -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
f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -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
a8043202c2 Update golems.dm 2017-09-27 22:43:57 -05:00