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

4261 Commits

Author SHA1 Message Date
LetterJay
5b81614e87 Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200 
[MIRROR] Fixes warning spam
 2017-10-01 16:32:46 -04:00
LetterJay
018300507a Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162 
[MIRROR] Fixes plasma cutters only hitting one tile
 2017-10-01 16:32:24 -04:00
LetterJay
0e50bc7884 Merge pull request #3049 from Citadel-Station-13/upstream-merge-31203 
[MIRROR] Fixes paper writing
 2017-10-01 16:32:12 -04:00
LetterJay
c8647565fc Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157 
[MIRROR] Fixes events with sleeps.
 2017-10-01 16:32:00 -04:00
LetterJay
f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145 
[MIRROR] Fixes aliums being able to attack the SM crystal
 2017-10-01 16:31:44 -04:00
LetterJay
f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605 
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
 2017-10-01 16:30:40 -04:00
LetterJay
3d2b5e99c9 Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143 
[MIRROR] adds a space
 2017-10-01 16:29:35 -04:00
LetterJay
8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132 
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
 2017-10-01 16:29:13 -04:00
LetterJay
2d8e3b301f Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128 
[MIRROR] Removes irccheck admin restriction
 2017-10-01 16:29:04 -04:00
LetterJay
1057b4b636 Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137 
[MIRROR] Fixes meteors not working with multi z
 2017-10-01 16:21:08 -04:00
LetterJay
e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138 
[MIRROR] Structure istype define
 2017-10-01 16:20:56 -04:00
LetterJay
b2a01d688d Merge pull request #3044 from Citadel-Station-13/upstream-merge-31136 
[MIRROR] Adds a single comment to is_helpers.dm
 2017-10-01 15:56:43 -04:00
LetterJay
21302e3fdc Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141 
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
 2017-10-01 15:49:44 -04:00
LetterJay
e3810ef517 Merge branch 'master' into upstream-merge-31128 2017-10-01 15:46:15 -04:00
LetterJay
6572781b63 Update forced_movement.dm 2017-10-01 14:43:06 -05:00
LetterJay
fafd98ed0e Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142 
[MIRROR] Fixes cogscarab sprites not updating
 2017-10-01 15:42:35 -04:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117 
[MIRROR] Fixes liches losing spells
 2017-10-01 15:42:12 -04:00
LetterJay
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
LetterJay
4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069 
[MIRROR] Cleanup to various loc assignments and nearby code
 2017-10-01 15:08:21 -04:00
LetterJay
eb24540ba3 Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108 
[MIRROR] Corrected shuttle refuel time
 2017-10-01 15:07:43 -04:00
LetterJay
490885a36f update 2017-10-01 13:02:52 -05:00
Jordan Brown
9082c8d241 Merge pull request #31200 from AnturK/pleasestop 
Fixes warning spam
 2017-10-01 08:43:36 -05:00
kevinz000
b13f2012fb Update closed.dm 2017-10-01 08:42:26 -05:00
AnturK
c4dd7ffdbd Fixes paper writing (#31203) 
* Fixes regex typo

* Actually fixes it properly
 2017-10-01 08:41:16 -05:00
AnturK
cae3dd615d Fixes events with sleeps. 2017-10-01 07:34:01 -05:00
ShizCalev
770a0a1154 Fixes aliums being able to attack the SM crystal 2017-10-01 05:04:30 -05:00
LetterJay
9f05ef16df Merge branch 'master' into upstream-merge-31108 2017-10-01 04:31:36 -04:00
LetterJay
926db45b54 Update world.dm 2017-10-01 03:06:11 -05:00
LetterJay
80a84db919 Update adminhelp.dm 2017-10-01 02:39:24 -05:00
LetterJay
ef10ac589a Update getrev.dm 2017-10-01 02:39:07 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
22b148f078 Merge pull request #3014 from Citadel-Station-13/upstream-merge-31140 
[MIRROR] Fixes AI law weights infinite loop
 2017-10-01 03:26:42 -04:00
LetterJay
37942a2279 Update hostile.dm 2017-10-01 01:57:49 -05:00
LetterJay
49c63dd794 Update randomverbs.dm 2017-10-01 01:57:03 -05:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJay
4be6f22669 Merge branch 'master' into upstream-merge-31108 2017-10-01 02:53:27 -04:00
LetterJay
92c3a48507 Merge branch 'master' into upstream-merge-31140 2017-10-01 02:53:18 -04:00
LetterJay
6a8ca2e02c Merge branch 'master' into upstream-merge-31037 2017-10-01 02:53:03 -04:00
LetterJay
b15f639621 Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722 
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
 2017-10-01 02:51:56 -04:00
LetterJay
ef96be641a Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856 
[MIRROR] Adds Nars-Ian and clock hawks
 2017-10-01 02:50:31 -04:00
LetterJay
81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763 
[MIRROR] Configuration datum refactor
 2017-10-01 02:50:17 -04:00
LetterJay
8be007225b Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085 
[MIRROR] Fixes shade attackby
 2017-10-01 02:20:35 -04:00
LetterJay
1d1a862e1b Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045 
[MIRROR] Reebe is fancier now
 2017-10-01 02:20:23 -04:00
LetterJay
747312cb6d updates 2017-10-01 00:59:59 -05:00
ninjanomnom
009532b907 for completeness sake 2017-10-01 00:21:47 -05:00
LetterJay
0cc54029e2 Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096 
[MIRROR] Cleans up some unused code
 2017-10-01 01:19:36 -04:00
LetterJay
33b481dffb Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073 
[MIRROR] Log attempted injections as well as successful ones
 2017-10-01 01:19:20 -04:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
kingofkosmos
0f387451f7 You can now examine an airlock to find out how to construct/deconstruct it (#30605) 
* Tweaks rwall construction examine-messages.

* Tweaks window construction examine-messages.

* Added airlock construction examine messages.

* Typo fix.

* Shortened the airlock electronics circuit message.

* Fixed examine text styles.

* Fixes.

* Fixed wall-examine showing on rwalls.

* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.

* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.

* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.

* Removed unnecessary rwall-examine.

* Sound full path.
 2017-10-01 00:04:14 -05:00
LetterJay
11b558c367 Merge branch 'master' into upstream-merge-31093 2017-10-01 00:50:26 -04:00