Commit Graph

7875 Commits

Author SHA1 Message Date
deathride58
01582ce0b7 Merge pull request #4676 from Citadel-Station-13/upstream-merge-34056
[MIRROR]  Fixes infernal jaunt causing devils to get stuck if interrupted
2018-01-05 22:17:28 +00:00
deathride58
ebf3863195 Merge pull request #4681 from Citadel-Station-13/upstream-merge-34034
[MIRROR] Makes crayons draw at the location you click
2018-01-05 22:16:53 +00:00
deathride58
6f720a2010 Merge pull request #4672 from Citadel-Station-13/upstream-merge-34083
[MIRROR] Removed some superfluous stack code
2018-01-05 22:16:16 +00:00
deathride58
4f30d77421 Merge pull request #4678 from Citadel-Station-13/upstream-merge-34109
[MIRROR] Changes Rock Description to be more descriptive
2018-01-05 22:15:22 +00:00
deathride58
c58fa5c732 Merge pull request #4668 from Citadel-Station-13/upstream-merge-34081
[MIRROR] Fixed PDAs not calling parent in equipped()
2018-01-05 22:14:16 +00:00
deathride58
baf104d3d8 Merge pull request #4669 from Citadel-Station-13/upstream-merge-34082
[MIRROR] Made the squeek component not make things squeak so often
2018-01-05 22:14:03 +00:00
deathride58
e0ff75a870 Merge pull request #4673 from Citadel-Station-13/upstream-merge-34077
[MIRROR] Fix incorrect method variable description in throw_impact
2018-01-05 22:13:19 +00:00
deathride58
6af2abfa0e Merge pull request #4674 from Citadel-Station-13/upstream-merge-34084
[MIRROR] Reduce away mission load time drastically
2018-01-05 22:12:44 +00:00
Jordan Brown
505fc95ad0 Merge pull request #34034 from deathride58/goonstylecrayons
Makes crayons draw at the location you click
2018-01-05 09:28:07 -06:00
Jordan Brown
5c64e25288 [512] Disallow cross-Z examination and manipulation 2018-01-05 09:25:54 -06:00
Jordan Brown
464a2820e3 Merge pull request #34109 from Niknakflak/Its_not_just_a_boulder_its_a_rock
Changes Rock Description to be more descriptive
2018-01-05 08:44:38 -06:00
Shadowlight213
e20cbe5aa7 Fixes infernal jaunt causing devils to get stuck if interrupted (#34056)
* Fixes infernal jaunt causing devils to get stuck if stunned.

* defines because I know a maintainer will yell at me for this.
2018-01-05 06:05:16 -06:00
Tad Hardesty
a55d2e7ff7 Show the correct coordinates when a pulse rifle prize is found (#34089) 2018-01-05 06:03:05 -06:00
Tad Hardesty
81cdedea5d Fix away missions taking 2+ minutes to load (#34084) 2018-01-05 06:01:52 -06:00
oranges
6012a5c6eb Fix bug with smashing bottles on throw (#34077)
The passed in variable is a datum, not a mob

Corrects the description for another instance of this
2018-01-05 06:01:44 -06:00
Cruix
015c46cbae Removed some superfluous stack code (#34083) 2018-01-05 06:01:36 -06:00
Cruix
e7641dd004 Made the squeek component not make things squeak so often (#34082) 2018-01-05 06:00:08 -06:00
Cruix
406ccb256f Fixed PDAs not calling parent in equipped() (#34081) 2018-01-05 05:59:54 -06:00
deathride58
3266cdfe0c Merge pull request #4667 from Citadel-Station-13/upstream-merge-34066
[MIRROR] Fixes white power cables in DM
2018-01-05 02:45:53 +00:00
deathride58
0ab9e0e209 Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:44:52 +00:00
deathride58
3a8e2870ca Merge pull request #4662 from Citadel-Station-13/upstream-merge-34059
[MIRROR] You now have to stand next to the decoy nuke disk and examine it to know it's fake
2018-01-05 02:44:21 +00:00
ShizCalev
3d3f28e091 Fixes white power cables in DM (#34066) 2018-01-04 20:16:31 -06:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
deathride58
877bd463b1 Merge pull request #4666 from Citadel-Station-13/upstream-merge-34091
[MIRROR] Fixes explosion runtimes
2018-01-05 02:02:22 +00:00
deathride58
f6c495885c Merge pull request #4663 from Citadel-Station-13/upstream-merge-34060
[MIRROR] Fixes brothers not assigning properly.
2018-01-05 01:57:59 +00:00
deathride58
1bfba8fd50 Update nuclearbomb.dm 2018-01-04 20:56:53 -05:00
deathride58
f875444339 Merge pull request #4661 from Citadel-Station-13/upstream-merge-34075
[MIRROR] Adds more observation messages in deadchat
2018-01-05 01:56:07 +00:00
deathride58
c63661871f Fixes explosion runtimes (#34091)
* fixes explosion runtimes

* cyka
2018-01-04 19:52:56 -06:00
Leo
7a2955b96f Merge pull request #34060 from AnturK/brotherfix
Fixes brothers not assigning properly.
2018-01-04 15:17:56 -06:00
ShiggyDiggyDo
8a176e126e You now have to stand next to the decoy nuke disk and examine it to know it's fake 2018-01-04 15:17:43 -06:00
Dax Dupont
bf3468f61c Adds more observation messages in deadchat (#34075)
* Adds more observation messages

* so bold kobold

* caching
2018-01-04 15:16:58 -06:00
deathride58
a8742c5799 fixes swarmer event disable regression, modularizes flyperson-only hulk 2018-01-04 13:00:44 -05:00
deathride58
1e1f83d945 fixes compiling errors and string regressions 2018-01-04 10:24:57 -05:00
deathride58
39016e36b2 fixing compiling errors one at a time 2018-01-04 02:37:02 -05:00
deathride58
61fdecffe5 ohhHH 2018-01-04 02:30:52 -05:00
deathride58
70e5568d32 web editor is garbage on mobile 2018-01-04 02:26:44 -05:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
deathride58
8f593f0d00 living carbon 2018-01-04 01:36:28 -05:00
deathride58
273b38a765 mob living simple_animal 2018-01-04 01:23:37 -05:00
deathride58
66f0a9c2b7 mob living silicon 2018-01-04 01:06:25 -05:00
deathride58
4957aa3cb0 mob living - root 2018-01-04 01:03:39 -05:00
deathride58
bdd460ed4a mob folder - root 2018-01-04 01:02:04 -05:00
deathride58
fd9bc8c35e mob folder - camera to dead 2018-01-04 00:59:07 -05:00
deathride58
cffbbbbbd1 mapping to mining, preparing for mob folder 2018-01-04 00:55:01 -05:00
deathride58
5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
deathride58
d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
deathride58
1acdd3ce5c controllers sync 2018-01-03 23:23:11 -05:00
deathride58
af96f58ffd syncs defines 2018-01-03 23:15:49 -05:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00