20172ca2bd
Merge pull request #31372 from ShizCalev/cool-runnings
...
Fixes cool threads grammar issue
2017-10-07 08:42:36 -05:00
5f4b3594d0
Automatic changelog generation for PR #3195 [ci skip]
2017-10-07 00:08:20 -05:00
0c6be827a2
Merge pull request #3195 from Citadel-Station-13/upstream-merge-31364
...
[MIRROR] Fixes Wood Being Invisible.
2017-10-07 01:08:18 -04:00
233388a345
Merge pull request #3194 from Citadel-Station-13/upstream-merge-31347
...
[MIRROR] Makes put_in_hands use drop_location()
2017-10-07 01:08:10 -04:00
ad43fdd5e8
Merge pull request #3192 from Citadel-Station-13/upstream-merge-31307
...
[MIRROR] Fixes maintainer detection for review auto-tagging
2017-10-07 01:07:12 -04:00
03bd841ac3
Merge pull request #3191 from Citadel-Station-13/upstream-merge-31344
...
[MIRROR] Lightgeists are gold core spawnable
2017-10-07 01:07:03 -04:00
091d7a743a
Merge pull request #3190 from Citadel-Station-13/upstream-merge-31353
...
[MIRROR] Autotagging tgui tree to UI label
2017-10-07 01:06:55 -04:00
7e547fa2cd
Merge pull request #3189 from Citadel-Station-13/upstream-merge-31359
...
[MIRROR] Adds Wumborian Fugu to the gold core spawn
2017-10-07 01:06:46 -04:00
bc91ec435f
Merge pull request #3188 from Citadel-Station-13/upstream-merge-31357
...
[MIRROR] Resolving tickets now informs the player.
2017-10-07 01:06:16 -04:00
b2095ce61d
Merge pull request #3187 from Citadel-Station-13/upstream-merge-31397
...
[MIRROR] actually fixes the exploit this time
2017-10-07 01:06:04 -04:00
5988122386
Merge branch 'master' into upstream-merge-31397
2017-10-07 01:05:58 -04:00
dc6d97a69a
Merge pull request #3186 from Citadel-Station-13/upstream-merge-31362
...
[MIRROR] Fixes deconstructive analyzer infinite material exploit
2017-10-07 01:05:33 -04:00
fe27aa586c
Merge pull request #3181 from Citadel-Station-13/upstream-merge-31336
...
[MIRROR] Fixes lighting object initialization on new zlevels.
2017-10-07 01:05:11 -04:00
acd3950652
Automatic changelog generation for PR #3185 [ci skip]
2017-10-07 00:05:04 -05:00
388ee9c5b7
Merge pull request #3185 from Citadel-Station-13/upstream-merge-31322
...
[MIRROR] Changes lower action icons to be text based
2017-10-07 01:05:03 -04:00
df53b21666
Merge pull request #3180 from Citadel-Station-13/upstream-merge-31314
...
[MIRROR] Fixes outdated away code.
2017-10-07 01:04:19 -04:00
2aaabda3a6
Automatic changelog generation for PR #3179 [ci skip]
2017-10-07 00:04:05 -05:00
edce74eb51
Merge pull request #3179 from Michiyamenotehifunana/toyguns
...
Adds more toy guns
2017-10-07 01:04:03 -04:00
343b480c53
Automatic changelog generation for PR #3178 [ci skip]
2017-10-07 00:03:37 -05:00
54fe9d3d96
Merge pull request #3178 from Citadel-Station-13/upstream-merge-31330
...
[MIRROR] Fixes runed metal and brass sprites
2017-10-07 01:03:35 -04:00
f9dcfc6e35
Merge pull request #3177 from Citadel-Station-13/upstream-merge-31333
...
[MIRROR] Sets turf decal layer
2017-10-07 01:03:25 -04:00
3d0a51e9bb
Automatic changelog generation for PR #2603 [ci skip]
2017-10-07 00:02:39 -05:00
46ec25b161
Merge pull request #2603 from deathride58/crewobjectivesandmiscreants
...
Ports Goon's Crew Objectives (feat. objectives from old Hippie) and Miscreants
2017-10-07 01:02:37 -04:00
c7617dc4a4
Merge pull request #3169 from Citadel-Station-13/upstream-merge-31326
...
[MIRROR] Cleans up leftover Hand of God gamemode references
2017-10-07 01:02:12 -04:00
89ab9a0fd7
Update rdconsole.dm
2017-10-06 22:24:24 -05:00
493352f680
Update stationCollision.dm
2017-10-06 22:23:31 -05:00
2b42ad5200
Update decal.dm
2017-10-06 22:22:35 -05:00
3f6d7d5244
Merge pull request #3176 from Citadel-Station-13/upstream-merge-31338
...
[MIRROR] Fix spelling of conscious
2017-10-06 23:20:58 -04:00
9a106dc1c6
Merge pull request #3175 from Citadel-Station-13/upstream-merge-31335
...
[MIRROR] [Delta] Adds missing warning lines under firedoors in xeno
2017-10-06 23:20:44 -04:00
da2ee4b4b1
Update _defines.dm
2017-10-06 22:20:27 -05:00
4d1a63bf05
Fixes Wood Being Invisible.
2017-10-06 21:46:15 -05:00
19ff9a0f75
Fixes Wood Being Invisible. ( #31364 )
...
* Fixes Wood
* Makes jackboots store items small and smaller just like in the description.
* Update internal.dm
2017-10-06 21:46:15 -05:00
e3e0f30c22
Makes put_in_hands use drop_location()
2017-10-06 21:36:57 -05:00
ebcacc733f
Makes put_in_hands use drop_location() ( #31347 )
2017-10-06 21:36:57 -05:00
585faa62a9
Fixes maintainer detection for review auto-tagging
2017-10-06 21:34:39 -05:00
63ff77842f
Fixes maintainer detection for review auto-tagging ( #31307 )
...
* Fixes maintainer detection for review auto-tagging
* User not author
* oranges was right
2017-10-06 21:34:38 -05:00
a40e5ee380
Lightgeists are gold core spawnable
2017-10-06 21:30:23 -05:00
a42bf62334
Lightgeists are gold core spawnable ( #31344 )
...
* buff chainsaws 2: electric boogaloo
sned help
* Revert "helps chainsaws out"
This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.
* helps chainsaws out
i'm sorry we hurt you chainsaws
* i'm not stupid i'm misguided!
but i actually totally agree with this so !go kor!
* AH, BINGO.
* ez
* honk
2017-10-06 21:30:23 -05:00
67cbeb5710
Autotagging tgui tree to UI label
2017-10-06 21:29:14 -05:00
70a5c4f80e
Autotagging tgui tree to UI label ( #31353 )
2017-10-06 21:29:14 -05:00
442b86f6a0
Adds Wumborian Fugu to the gold core spawn
2017-10-06 21:28:04 -05:00
0a3949968d
Makes Wumborian Fugu gold core spawnable ( #31359 )
2017-10-06 21:28:04 -05:00
91607368e0
Resolving tickets now informs the player.
2017-10-06 21:25:53 -05:00
f2102c68f1
Resolving tickets now informs the player. ( #31357 )
...
* Update adminhelp.dm
* Update adminhelp.dm
2017-10-06 21:25:53 -05:00
6a4fb2b26a
actually fixes the exploit this time
2017-10-06 20:38:53 -05:00
07947dae7d
Fixes deconstructive analyzer infinite material exploit
2017-10-06 20:22:27 -05:00
005cc54bfa
Update rdconsole.dm
2017-10-06 20:22:27 -05:00
8774ef6914
Boolean memes
...
No more zeroes or ones, only TRUE and FALSE. Well, for the toy stuff anyways. The rest of the guns will have a boolean fixing thing later.
2017-10-07 09:03:14 +08:00
20bdd190a9
Changes lower action icons to be text based
2017-10-06 16:56:46 -05:00
8cf57b91b1
Changes lower action icons to be text based ( #31322 )
...
* wee
* screen clock update
* resist and stop pulling
* Whoop, Joan messed up on the selection border so here's some fixed icons for that
2017-10-06 16:56:46 -05:00
Jordan Brown