Commit Graph

5121 Commits

Author SHA1 Message Date
LetterJay
3160051499 Merge pull request #3425 from Citadel-Station-13/upstream-merge-31735
[MIRROR] Fixes emotes not checking the right turf (or any turf for that matter)
2017-10-16 07:28:13 -04:00
LetterJay
e4d2609800 Merge pull request #3420 from Citadel-Station-13/upstream-merge-31665
[MIRROR] Adds logging crew manifest to seperate file
2017-10-16 07:28:03 -04:00
LetterJay
7824c58539 Merge pull request #3418 from Citadel-Station-13/upstream-merge-31728
[MIRROR] Sunflower makeover, adds missing inhands sprites.
2017-10-16 07:27:31 -04:00
LetterJay
399d84500c Merge pull request #3419 from Citadel-Station-13/upstream-merge-31139
[MIRROR] Honkbots: The Clown's lil helpers.
2017-10-16 07:27:15 -04:00
LetterJay
a5628fe332 Merge pull request #3423 from Citadel-Station-13/upstream-merge-31738
[MIRROR] makes loaded templates call air_update_turf() on bordering turfs
2017-10-16 07:25:52 -04:00
LetterJay
ec41bbc420 Merge pull request #3422 from Citadel-Station-13/upstream-merge-31733
[MIRROR] closed turfs remove themselves from SSair.high_pressure_delta on change
2017-10-16 07:25:44 -04:00
LetterJay
a11a474a94 Merge pull request #3416 from Citadel-Station-13/upstream-merge-31698
[MIRROR] Prevents tiles from being placed on top of buckled mobs
2017-10-16 07:09:30 -04:00
LetterJay
5dd348564a Merge pull request #3415 from Citadel-Station-13/upstream-merge-31690
[MIRROR] You can smash the bulbs in floodlights
2017-10-16 07:09:17 -04:00
LetterJay
a703a599fa Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695
[MIRROR] Makes directional windows only block air if anchored
2017-10-16 07:08:11 -04:00
LetterJay
74bc1be6c2 Merge pull request #3412 from Citadel-Station-13/upstream-merge-31705
[MIRROR] Fixes tendril possession
2017-10-16 07:08:02 -04:00
LetterJay
d5d0fa919a Merge pull request #3411 from Citadel-Station-13/upstream-merge-31714
[MIRROR] Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-16 07:06:37 -04:00
LetterJay
029d98028a Merge pull request #3410 from Citadel-Station-13/upstream-merge-31713
[MIRROR] Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-16 07:06:28 -04:00
Jordan Brown
814bf72d66 Fixes emotes not checking the right turf (or any turf for that matter) (#31735)
* Fixes emotes not checking the right turf (or any turf for that matter)
2017-10-15 19:41:01 -05:00
duncathan salt
fcab4e8a59 makes loaded templates call air_update_turf() on bordering turfs (#31738)
* makes loaded templates call air_update_turf() on bordering turfs

* safety check for OOB turfs; fixes compile error
2017-10-15 19:34:33 -05:00
duncathan salt
3da718d3b1 closed turfs remove themselves from SSair.high_pressure_delta on change (#31733) 2017-10-15 19:32:20 -05:00
AnturK
64b1be05ff Adds logging crew manifest to seperate file (#31665)
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
2017-10-15 16:56:48 -05:00
Mercenaryblue
3690fc56c2 Honkbots: The Clown's lil helpers. (#31139)
* Honkbots 0.9.0

Old code, needs testing.

* Honkbots 0.9.1

Small Fixes - Part 1

* Honkbot 0.9.1b

Fixes

* Honkbots 0.9.2

Added sound cooldown, fixes.

* Honkbots 0.9.5

Clown Box & Honkbot Assembly Code

* 0.9.5.a

oops

* Honkbots 1.0.0

Final touches and fixes.
Clown Box finished.
Assembly functioning.
Honkbots tested and ready to go.
Its time.

* Honkbots 1.0.1

Initialize and . = ..()

* Honkbots 1.0.2

Fixes and Changes
====
Nerfed Brute/Thermal Resist
Buffed Health (to avoid 1-shot)
Added HONK_BOT define

* Honkbots 1.0.3

Removed the cardboard assembly from death gibs.
Admin Bwoink removed from emagged soundtrack.
Honkbot now release an evil laugh when emagged.
Fixed strange behaviors on emagged level 1
Added a check against stamping multiple cardboard sheets.
Stamping a Clown Box now plays the bike horn, once.
Clown Boxes no longer get automatically placed in hands.
Various other fixes.

* Honkbots 1.0.3a

* Honkbots 1.0.3.b

Fixes.

* Honkbots 1.0.4

*Added an emote ping upon assembly creation.
*Enabled either Theatre or Robotics for access. ((fixing needing both))
*Honkbots are now more forgiving after being hit.
**Airhorn stun_attack now deals slight ear damage, for about 5 seconds.
**Cardboard no longer drops upon death. Robot arms have 50% chance.
**Using a new get_sfx() list when emagged.
**Optimization and other minor fixes.

* Honkbots 1.0.4.a

Missed it.

* Honkbots 1.0.4.b

use(1) and (client)

* Honkbots 1.0.4.c

Moved proc

* Honkbots 1.0.5

*Code Optimization
*Renaming w/ Pen (how could I even forget this)
*Assembly Defines

I'm afraid I'm simply out of my depth with the suggested use(1) rework.

* Honkbots 1.0.5.c

Reworked cardboard stamping.

It now works in the hands and on the ground, either solo or in stacks, and prevent itself being used in backpacks.

* Honkbots 1.0.5.d

Final

* Honkbots 1.0.5.e

comment

* 1.0.5.f

Optimization

* Honkbots 1.0.5.g

Missed requested stuff

* Honkbots 1.0.6

Requested changes.

* Honkbots 1.0.6a

Oops.

* Honkbots 1.0.6.c

Bugfix - Prevent building in backpacks.
Make sure they spawn on turf.

* Honkbots 1.0.7

one less spawn(0)
flag optimization
else return ..()

* Honkbots 1.0.7.a

Get rids of a lot of client checks at the cost of automatic AI retoration.

* Honkbots 1.0.7.b

Added judgment_criteria()
changed assess_threat to use judgment

* Honkbots 1.0.7.c

final = NONE
2017-10-15 16:44:23 -05:00
Onule
5bdadb7d4e Sunflower makeover, adds missing inhands sprites. (#31728)
* New sunflower sprite, added inhand sprites, first time messing with git

* Updates sunflower and variant's sprites, adds new growing stage sprites for sunflower variants, new inhands sprites.

* Made the leaves a bit higher. Das it
2017-10-15 16:34:01 -05:00
Leo
0380e43f33 Merge pull request #31698 from duncathan/atmos-patch7
Prevents tiles from being placed on top of buckled mobs
2017-10-15 14:02:02 -05:00
KorPhaeron
6ea3f1293c You can smash the bulbs in floodlights (#31690)
* You can smash the bulbs in floodlights

* Floodlight breaking but properly
2017-10-15 12:55:31 -05:00
Jordan Brown
e6def19aa2 Merge pull request #31695 from ninjanomnom/directional-windows
Makes directional windows only block air if anchored
2017-10-15 11:33:33 -05:00
Armhulen
c516404175 Fixes tendril possession (#31705) 2017-10-15 11:33:24 -05:00
Jordan Brown
3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
Jordan Brown
4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-15 11:32:05 -05:00
WJohn
4b3f578633 Readds the boxstation whiteship as a ruin. (#31709)
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
2017-10-15 11:31:48 -05:00
LetterJay
be2dc49384 Merge pull request #3408 from Citadel-Station-13/upstream-merge-31694
[MIRROR] Prevents the fire reaction from leaving garbage in the gas mixture
2017-10-15 10:24:22 -04:00
LetterJay
670bd1ef53 Merge pull request #3407 from Citadel-Station-13/upstream-merge-31696
[MIRROR] Fixes freon colours never going away
2017-10-15 10:24:12 -04:00
LetterJay
e72d36c381 Merge pull request #3406 from deathride58/heavysechoundnerfs
INTENSE BORGO BALANCE CHANGES
2017-10-15 10:23:37 -04:00
LetterJay
a1187795dd Merge pull request #3405 from Citadel-Station-13/upstream-merge-31692
[MIRROR] allows vent internal pressure bound to be set by air alarms
2017-10-15 10:23:26 -04:00
LetterJay
6a288fec29 Merge pull request #3403 from Citadel-Station-13/upstream-merge-31661
[MIRROR] Fixes custom shuttle docker display
2017-10-15 10:23:07 -04:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-15 10:22:59 -04:00
LetterJay
666ef5f60d Merge pull request #3401 from Citadel-Station-13/upstream-merge-31652
[MIRROR] Golden Bike Horns now have a small delay between each flips.
2017-10-15 10:22:52 -04:00
LetterJay
1a79e09cf8 Merge pull request #3400 from Citadel-Station-13/upstream-merge-31663
[MIRROR] Repopulates SSshuttle recover
2017-10-15 10:22:17 -04:00
LetterJay
499254761c Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671
[MIRROR] ID ejecting from computers by alt-clicking
2017-10-15 10:22:04 -04:00
LetterJay
8f97e8c65f Merge pull request #3398 from Citadel-Station-13/upstream-merge-31688
[MIRROR] fixes filter NaN issue
2017-10-15 10:21:46 -04:00
LetterJay
6bcec20501 Merge pull request #3396 from Citadel-Station-13/upstream-merge-31679
[MIRROR] Adds petcollars to the cmo, captain, and bartender's locker
2017-10-15 10:21:11 -04:00
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
2017-10-15 10:20:04 -04:00
LetterJay
5b4bb85ca1 Merge pull request #3394 from Citadel-Station-13/upstream-merge-31726
[MIRROR] restores safety check in gas mixture temperature_share()
2017-10-15 10:19:33 -04:00
duncathan salt
e2e4d7aa60 Prevents the fire reaction from leaving garbage in the gas mixture (#31694) 2017-10-15 08:48:31 -05:00
LetterJay
243d8759c7 Update gas_mixture.dm 2017-10-15 07:51:48 -05:00
LetterJay
a5ee5c76c8 Merge pull request #3393 from Citadel-Station-13/upstream-merge-31684
[MIRROR] [s] Removes scrubber and filter infinite pressure exploits.
2017-10-15 08:48:56 -04:00
LetterJay
e2914c5987 Merge pull request #3392 from Citadel-Station-13/upstream-merge-31677
[MIRROR] Allows mobs to get shocked when they smash things
2017-10-15 08:48:26 -04:00
LetterJay
2f88a62b26 Merge pull request #3391 from Citadel-Station-13/upstream-merge-31674
[MIRROR] Resets client movement delay to its initial value on death
2017-10-15 08:48:17 -04:00
LetterJay
58872d8b02 Merge pull request #3390 from Citadel-Station-13/upstream-merge-31616
[MIRROR] readds guardians to the uplink
2017-10-15 08:48:04 -04:00
Leo
9c7d2ef609 Merge pull request #31696 from duncathan/atmos-patch6
Fixes freon colours never going away
2017-10-15 07:32:53 -05:00
LetterJay
f4753de219 Update gland.dm 2017-10-15 07:00:28 -05:00
LetterJay
f68230c93c Update job_closets.dm 2017-10-15 06:58:52 -05:00
deathride58
dc7f43d72c lets it actually compile 2017-10-15 02:16:13 -04:00
deathride58
bc12f646ed adds sounds to dogborg pounce 2017-10-15 02:10:01 -04:00
deathride58
d6d9c1e1a8 bluh 2017-10-15 01:01:20 -04:00