shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,836 Commits 5 Branches 0 Tags
063a44281e39bdf01a27ea42942a0da43ecdfd0a
Commit Graph
4150 Commits
Author SHA1 Message Date
LetterJayandGitHub 063a44281e Merge branch 'master' into upstream-merge-31044 2017-09-30 14:53:08 -04:00
LetterJayandGitHub b810f30e10 Update clockwork_slab.dm 2017-09-30 12:48:49 -05:00
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJayandGitHub 2bbc880bf1 Merge pull request #3009 from Citadel-Station-13/upstream-merge-31092 
[MIRROR] Fixes subsystems not returning a qdel hint
 2017-09-30 12:58:30 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub e52d346e7e Merge pull request #3028 from Raeschen/master 
Changes MIN_AGE to be in line with server rule 0
 2017-09-30 12:56:20 -04:00
LetterJayandGitHub 73e7fb458c Merge pull request #3027 from Citadel-Station-13/upstream-merge-31123 
[MIRROR] Fixes dresser being unattackable
 2017-09-30 12:56:13 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 99712e76e9 Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873 
[MIRROR] Paper markdown
 2017-09-30 12:55:53 -04:00
LetterJayandGitHub 435865f23d Merge pull request #3022 from Citadel-Station-13/upstream-merge-31098 
[MIRROR] RegisterSignal() can now accept a list
 2017-09-30 12:55:44 -04:00
LetterJayandGitHub 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
Raeschen f79ad840b2 Changes MIN_AGE to be in line with server rule 0 2017-09-30 16:30:36 +01:00
AnturKandCitadelStationBot 3ec5a637e5 Fixes dresser being unattackable (#31123) 2017-09-30 10:30:09 -05:00
Jordan BrownandCitadelStationBot 3b64e0ec35 [s] Fixes config reading exploit 2017-09-30 09:45:13 -05:00
nicbnandCitadelStationBot 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
Jordan BrownandCitadelStationBot 08ecb0e322 RegisterSignal() can now accept a list (#31098) 
* RegisterSignal may now accept a list of signals

* Update old calls to RegisterSignal()
 2017-09-30 08:09:42 -05:00
Tad HardestyandCitadelStationBot 20e7f03910 Strip propriety macros from tooltips (#31113) 2017-09-30 08:03:28 -05:00
orangesandCitadelStationBot 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
LetterJayandGitHub dc2140a88d Update paper.dm 2017-09-30 02:15:40 -05:00
LetterJayandGitHub b5cdb64a53 Update extinguisher.dm 2017-09-30 01:44:31 -05:00
LetterJayandGitHub 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
LetterJayandGitHub eb05246c8b Update giant_spider.dm 2017-09-29 23:33:54 -05:00
ShizCalevandCitadelStationBot 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 BrownandCitadelStationBot cd334646c3 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
AnturKandCitadelStationBot c37f74035e Fixes evidence bag not respecting inventory 2017-09-29 16:00:30 -05:00
Jordan BrownandCitadelStationBot 77c2c77f0e Removes a call to datum/New() 2017-09-29 15:59:19 -05:00
Jordan BrownandCitadelStationBot da29f2c8d4 Fixes subsystems not returning a qdel hint 2017-09-29 15:59:04 -05:00
LetterJayandGitHub e8f581bb56 Merge branch 'master' into upstream-merge-31077 2017-09-29 12:46:25 -04:00
LetterJayandGitHub 2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns 
Wave 3 of guns
 2017-09-29 12:45:52 -04:00
LetterJayandGitHub a12df2019f Merge pull request #2966 from Citadel-Station-13/upstream-merge-31024 
[MIRROR] Air tanks get their own sprite, plus reset fix.
 2017-09-29 12:19:27 -04:00
LetterJayandGitHub 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
LetterJayandGitHub c80237c969 Update tank_types.dm 2017-09-29 00:48:53 -05:00
LetterJayandGitHub 2d1d0b7fd8 Update tank_types.dm 2017-09-29 00:48:01 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 8762540452 Merge pull request #2999 from Citadel-Station-13/upstream-merge-31072 
[MIRROR] Add a fingerprint to pipes when interacted with by a wrench
 2017-09-29 01:46:14 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 8f6b143161 Merge pull request #2995 from Citadel-Station-13/upstream-merge-31076 
[MIRROR] Fix dangling #elseif in list helpers
 2017-09-29 01:45:25 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 781b0359ae Merge pull request #2993 from Citadel-Station-13/upstream-merge-30714 
[MIRROR] Shooting walls can create bullet holes/dents
 2017-09-29 01:44:54 -04:00
LetterJayandGitHub d6a89948a2 Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078 
[MIRROR] Cleanup operative landmarks
 2017-09-29 01:44:17 -04:00
LetterJayandGitHub 1715845fe1 Merge pull request #2990 from Citadel-Station-13/upstream-merge-31081 
[MIRROR] You can now light cigars on burning people
 2017-09-29 01:43:59 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 3c608b3ad4 Merge pull request #2986 from Citadel-Station-13/upstream-merge-31079 
[MIRROR] Remove unused ninja team var
 2017-09-29 01:42:31 -04:00
LetterJayandGitHub c8a03440cb Merge pull request #2978 from Citadel-Station-13/upstream-merge-30834 
[MIRROR] Self replacement fix
 2017-09-29 01:42:17 -04:00